diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 2cb05ce..c2e8c69 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -24,14 +24,14 @@
 		<property name="basenames" value="${application.i18n.packages}"/>
 	</bean>
 
-	<bean class="com.casic.PgInterface.core.logback.JulHandler"/>
+    <bean class="com.casic.PgInterface.core.logback.JulHandler"/>
 
-	<bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
+    <bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
 
-	<bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
+    <bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
 
-	<bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
-		<property name="baseDir" value="${store.baseDir}"/>
-	</bean>
+    <bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
+        <property name="baseDir" value="${store.baseDir}"/>
+    </bean>
 
 </beans>
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 2cb05ce..c2e8c69 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -24,14 +24,14 @@
 		<property name="basenames" value="${application.i18n.packages}"/>
 	</bean>
 
-	<bean class="com.casic.PgInterface.core.logback.JulHandler"/>
+    <bean class="com.casic.PgInterface.core.logback.JulHandler"/>
 
-	<bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
+    <bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
 
-	<bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
+    <bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
 
-	<bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
-		<property name="baseDir" value="${store.baseDir}"/>
-	</bean>
+    <bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
+        <property name="baseDir" value="${store.baseDir}"/>
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 6510e28..c85f677 100644
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 2cb05ce..c2e8c69 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -24,14 +24,14 @@
 		<property name="basenames" value="${application.i18n.packages}"/>
 	</bean>
 
-	<bean class="com.casic.PgInterface.core.logback.JulHandler"/>
+    <bean class="com.casic.PgInterface.core.logback.JulHandler"/>
 
-	<bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
+    <bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
 
-	<bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
+    <bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
 
-	<bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
-		<property name="baseDir" value="${store.baseDir}"/>
-	</bean>
+    <bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
+        <property name="baseDir" value="${store.baseDir}"/>
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 6510e28..c85f677 100644
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 7fa8a50..386a71d 100644
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 2cb05ce..c2e8c69 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -24,14 +24,14 @@
 		<property name="basenames" value="${application.i18n.packages}"/>
 	</bean>
 
-	<bean class="com.casic.PgInterface.core.logback.JulHandler"/>
+    <bean class="com.casic.PgInterface.core.logback.JulHandler"/>
 
-	<bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
+    <bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
 
-	<bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
+    <bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
 
-	<bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
-		<property name="baseDir" value="${store.baseDir}"/>
-	</bean>
+    <bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
+        <property name="baseDir" value="${store.baseDir}"/>
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 6510e28..c85f677 100644
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 7fa8a50..386a71d 100644
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 431e65c..4bd0b78 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 611ac92..61a7a58 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,23 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$口说明新需求.docx" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" afterPath="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -32,36 +44,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgAlarmRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <file leaf-file-name="PgCsDocumentRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-              <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+              <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
               <folding>
-                <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="e#3527#3532#0" expanded="false" />
-                <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-                <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+                <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+                <element signature="e#3625#3641#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <file leaf-file-name="PgMaintainRs.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-              <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+              <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PgAlarmDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <file leaf-file-name="PgPatrolRs.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-              <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+            <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+              <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -85,17 +96,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainDocManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
@@ -125,8 +125,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
@@ -136,6 +134,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.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/PgCsDocumentRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java" />
       </list>
     </option>
   </component>
@@ -196,9 +207,10 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="width" value="1378" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
@@ -228,6 +240,20 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -263,58 +289,6 @@
               <option name="myItemId" value="main" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="webapp" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="WEB-INF" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -371,6 +345,74 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="reservePlan" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="patroler" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -428,11 +470,33 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="devData" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -462,7 +526,37 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -473,20 +567,6 @@
         </subPane>
       </pane>
       <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +994,12 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="Make" enabled="true" />
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1025,7 +1110,10 @@
       <workItem from="1531461252664" duration="1261000" />
       <workItem from="1531703142074" duration="10522000" />
       <workItem from="1531792335849" duration="7749000" />
-      <workItem from="1532047483654" duration="4369000" />
+      <workItem from="1532047483654" duration="5024000" />
+      <workItem from="1532230576899" duration="4412000" />
+      <workItem from="1532331902814" duration="16741000" />
+      <workItem from="1532911591262" duration="6303000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1211,11 +1299,15 @@
       <created>1531724270576</created>
       <updated>1531724270576</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改报警设备类型统计">
+      <created>1532073676460</created>
+      <updated>1532073676460</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="766122000" />
+    <option name="totallyTimeSpent" value="794233000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1238,7 +1330,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="728" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1250,20 +1342,20 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57644993" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23418804" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23247863" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2469697" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28247735" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1277,18 +1369,18 @@
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.63418806" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
-      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2974359" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.52478635" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2159091" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -1308,8 +1400,8 @@
       <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
     </layout-to-restore>
   </component>
@@ -1328,7 +1420,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="完成设备监控管理接口" />
     <MESSAGE value="完成巡检维护增删改查" />
     <MESSAGE value="完成报警、报警阈值、巡检维护功能开发" />
     <MESSAGE value="完成报警与设备联动、报警与预案联动、报警与摄像机联动功能" />
@@ -1353,11 +1444,12 @@
     <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>
-      <option name="time" value="216" />
+      <option name="time" value="236" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1365,230 +1457,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5913978" vertical-offset="0" max-vertical-offset="1342">
-          <caret line="17" column="31" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.39247313" vertical-offset="1739" max-vertical-offset="2552">
-          <caret line="152" column="8" selection-start-line="152" selection-start-column="8" selection-end-line="152" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
-          <caret line="73" column="38" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
-          <caret line="70" column="19" selection-start-line="70" selection-start-column="19" selection-end-line="70" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
-          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
-          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
-          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
-          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
-          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
-        </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 vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
-          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
-          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
-          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
-          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.47311828" vertical-offset="792" max-vertical-offset="4906">
-          <caret line="45" column="55" selection-start-line="45" selection-start-column="55" selection-end-line="45" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5963303" vertical-offset="2249" max-vertical-offset="3058">
-          <caret line="301" column="11" selection-start-line="301" selection-start-column="11" selection-end-line="301" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="2190" max-vertical-offset="5764">
-          <caret line="137" column="91" selection-start-line="137" selection-start-column="91" selection-end-line="137" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/403.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="2.0272374" vertical-offset="300" max-vertical-offset="1474">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/500.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.29961088" vertical-offset="0" max-vertical-offset="3102">
-          <caret line="7" column="43" selection-start-line="7" selection-start-column="43" selection-end-line="7" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/webapp/common/404.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.07885305" vertical-offset="462" max-vertical-offset="5566">
-          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3548387" vertical-offset="0" max-vertical-offset="1474">
-          <caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.5559633" vertical-offset="489" max-vertical-offset="1034">
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
-        </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 vertical-scroll-proportion="0.33333334" vertical-offset="12" max-vertical-offset="3564">
-          <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.493578" vertical-offset="83" max-vertical-offset="1276">
-          <caret line="18" column="32" selection-start-line="18" selection-start-column="32" selection-end-line="18" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.24953096" vertical-offset="725" max-vertical-offset="5522">
-          <caret line="53" column="0" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="364" max-vertical-offset="1166">
-          <caret line="52" column="26" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="166" max-vertical-offset="1188">
-          <caret line="37" column="5" selection-start-line="37" selection-start-column="5" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35842294" vertical-offset="1252" max-vertical-offset="2992">
-          <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="630" max-vertical-offset="1188">
@@ -1645,13 +1513,6 @@
         </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 vertical-scroll-proportion="0.4440367" vertical-offset="594" max-vertical-offset="2838">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.7155963" vertical-offset="534" max-vertical-offset="1672">
@@ -1666,14 +1527,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-7.92" vertical-offset="0" max-vertical-offset="924">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.74910396" vertical-offset="0" max-vertical-offset="1672">
@@ -1682,62 +1535,346 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.9318997" vertical-offset="0" max-vertical-offset="1210">
-          <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" />
-          <folding>
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6738351" vertical-offset="262" max-vertical-offset="968">
           <caret line="60" column="7" selection-start-line="60" selection-start-column="7" selection-end-line="60" selection-end-column="7" />
-          <folding>
-            <element signature="method#getTjResultByAlarmType#0;class#PgAlarmTjRs#0" expanded="false" />
-            <element signature="method#getAlarmByTime#0;class#PgAlarmTjRs#0" expanded="false" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3505535" vertical-offset="184" max-vertical-offset="1980">
+          <caret line="20" column="37" selection-start-line="20" selection-start-column="37" selection-end-line="20" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/properties.lst">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.08118081" vertical-offset="0" max-vertical-offset="542">
+          <caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-filter.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2002">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-hibernate.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="572">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-jdbc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="594">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-bridge.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="529">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6944444" vertical-offset="420" max-vertical-offset="924">
+          <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/logback.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="2046">
+          <caret line="24" column="9" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/spring/applicationContext-springmvc.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1210">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7096774" vertical-offset="0" max-vertical-offset="2420">
-          <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
-          <folding />
+        <state vertical-scroll-proportion="0.6494465" vertical-offset="0" max-vertical-offset="2420">
+          <caret line="16" column="47" selection-start-line="16" selection-start-column="47" selection-end-line="16" selection-end-column="47" />
+        </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 vertical-scroll-proportion="0.4442344" vertical-offset="117" max-vertical-offset="2838">
+          <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="1.6236162" vertical-offset="0" max-vertical-offset="3564">
+          <caret line="60" column="33" selection-start-line="60" selection-start-column="33" selection-end-line="60" selection-end-column="33" />
+        </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 vertical-scroll-proportion="2.4428043" vertical-offset="700" max-vertical-offset="7876">
+          <caret line="112" column="31" selection-start-line="112" selection-start-column="31" selection-end-line="112" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0048076925" vertical-offset="174" max-vertical-offset="1210">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+          <folding>
+            <element signature="method#getAlarmByTime#0;class#PgAlarmTjManager#0" expanded="false" />
+          </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 vertical-scroll-proportion="0.0" vertical-offset="78" max-vertical-offset="3476">
-          <caret line="34" column="16" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
+        <state vertical-scroll-proportion="0.28846154" vertical-offset="342" max-vertical-offset="3476">
+          <caret line="38" column="8" selection-start-line="38" selection-start-column="8" selection-end-line="38" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
+          <caret line="73" column="34" selection-start-line="73" selection-start-column="34" selection-end-line="73" selection-end-column="34" />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1254">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="990" max-vertical-offset="2134">
-          <caret line="69" column="24" selection-start-line="69" selection-start-column="24" selection-end-line="69" selection-end-column="24" />
+        <state vertical-scroll-proportion="-2.5298507" vertical-offset="3402" max-vertical-offset="3938">
+          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="342" max-vertical-offset="924">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3321033" vertical-offset="2638" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="212" max-vertical-offset="1298">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+        </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 vertical-scroll-proportion="2.326165" vertical-offset="528" max-vertical-offset="3696">
+          <caret line="107" column="37" selection-start-line="107" selection-start-column="37" selection-end-line="107" selection-end-column="37" />
           <folding>
-            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="e#3527#3532#0" expanded="false" />
-            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#setPgAlarmRuleManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#2103#2119#0" expanded="true" />
+            <element signature="method#getAlarmRule#0;class#PgAlarmRuleRs#0" expanded="false" />
+            <element signature="e#5169#5185#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6642066" vertical-offset="938" max-vertical-offset="1980">
-          <caret line="102" column="5" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />
+        <state vertical-scroll-proportion="-11.634862" vertical-offset="6781" max-vertical-offset="7458">
+          <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="834" max-vertical-offset="1496">
+          <caret line="80" column="12" selection-start-line="80" selection-start-column="12" selection-end-line="80" selection-end-column="12" />
+          <folding>
+            <element signature="e#1236#1237#0" expanded="true" />
+            <element signature="e#1267#1268#0" expanded="true" />
+            <element signature="e#1315#1316#0" expanded="true" />
+            <element signature="e#1355#1356#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="614" max-vertical-offset="1276">
+          <caret line="45" column="23" selection-start-line="45" selection-start-column="23" selection-end-line="45" selection-end-column="23" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1628">
+          <caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
+          <folding>
+            <element signature="e#933#934#0" expanded="true" />
+            <element signature="e#958#959#0" expanded="true" />
+            <element signature="e#992#993#0" expanded="true" />
+            <element signature="e#1020#1021#0" expanded="true" />
+            <element signature="e#1987#1988#0" expanded="true" />
+            <element signature="e#2018#2019#0" expanded="true" />
+            <element signature="e#2066#2067#0" expanded="true" />
+            <element signature="e#2106#2107#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.543021" vertical-offset="2" max-vertical-offset="2112">
+          <caret line="25" column="33" selection-start-line="25" selection-start-column="21" selection-end-line="25" selection-end-column="33" />
+          <folding>
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.0.6.RELEASE/spring-web-4.0.6.RELEASE-sources.jar!/org/springframework/http/ResponseEntity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33208954" vertical-offset="482" max-vertical-offset="2772">
+          <caret line="45" column="13" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintainDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="113" max-vertical-offset="1320">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </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 vertical-scroll-proportion="0.6744186" vertical-offset="113" max-vertical-offset="1342">
+          <caret line="21" column="32" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="32" />
+          <folding />
+        </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 vertical-scroll-proportion="0.0" vertical-offset="1114" max-vertical-offset="1870">
+          <caret line="109" column="62" selection-start-line="109" selection-start-column="58" selection-end-line="109" selection-end-column="62" />
+          <folding>
+            <element signature="method#getpgReservePlanDto#0;class#PgReservePlanManager#0" expanded="false" />
+            <element signature="method#getReservePlanDtoByAlarmType#0;class#PgReservePlanManager#0" expanded="false" />
+            <marker date="1532917214081" expanded="true" signature="-1:-1" placeholder="select count..PG_RESERVE_PLAN..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.39426523" vertical-offset="1166" max-vertical-offset="4950">
+          <caret line="83" column="16" selection-start-line="81" selection-start-column="11" selection-end-line="83" selection-end-column="16" />
+          <folding>
+            <element signature="e#1646#1662#0" expanded="true" />
+            <element signature="e#1758#1776#0" expanded="true" />
+            <element signature="e#2442#2458#0" expanded="true" />
+            <element signature="e#3620#3636#0" expanded="true" />
+          </folding>
+        </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 vertical-scroll-proportion="0.0" vertical-offset="344" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4040" max-vertical-offset="4862">
+          <caret line="220" column="43" selection-start-line="220" selection-start-column="43" selection-end-line="220" selection-end-column="43" />
+          <folding>
+            <element signature="method#setPgCsDocumentManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="method#setPgConstructionManager#0;class#PgCsDocumentRs#0" expanded="false" />
+            <element signature="e#3625#3641#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="4508" max-vertical-offset="5830">
+          <caret line="240" column="16" selection-start-line="240" selection-start-column="16" selection-end-line="240" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgCsDocumentManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="1051" max-vertical-offset="2420">
+          <caret line="81" column="25" selection-start-line="81" selection-start-column="19" selection-end-line="81" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolDocManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.31376147" vertical-offset="621" max-vertical-offset="1892">
+          <caret line="51" column="22" selection-start-line="51" selection-start-column="22" selection-end-line="51" selection-end-column="22" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44036698" vertical-offset="4886" max-vertical-offset="5610">
+          <caret line="256" column="0" selection-start-line="256" selection-start-column="0" selection-end-line="257" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
index 8ed5759..c7ab2a9 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.devTable.domain;
 
+import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
 
 import javax.persistence.*;
@@ -20,6 +21,7 @@
     private int active;//标志位
     private List<PgAlarm> alarmList;
     private List<PgReservePlan> reservePlanList;
+    private List<PgAlarmRule> alarmRuleList;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM__TYPE_ID")
@@ -66,4 +68,13 @@
     public void setReservePlanList(List<PgReservePlan> reservePlanList) {
         this.reservePlanList = reservePlanList;
     }
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "alarmTypeId")
+    public List<PgAlarmRule> getAlarmRuleList() {
+        return alarmRuleList;
+    }
+
+    public void setAlarmRuleList(List<PgAlarmRule> alarmRuleList) {
+        this.alarmRuleList = alarmRuleList;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
index 68b14cf..3323ba4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgAlarmRule.java
@@ -1,5 +1,9 @@
 package com.casic.PgInterface.patroler.domain;
 
+import com.casic.PgInterface.devTable.domain.PgAlarmType;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
 import javax.persistence.*;
 import java.io.Serializable;
 
@@ -17,6 +21,7 @@
     private String lowValue;//低限
     private String unit;//单位
     private String devType;//设备类型
+    private PgAlarmType alarmTypeId;//报警类型
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ALARM_RULE_ID")
@@ -64,6 +69,14 @@
         this.devType = devType;
     }
 
+    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+    @NotFound(action = NotFoundAction.IGNORE)
+    @JoinColumn(name = "ALARMTYPEID")
+    public PgAlarmType getAlarmTypeId() {
+        return alarmTypeId;
+    }
 
-
+    public void setAlarmTypeId(PgAlarmType alarmTypeId) {
+        this.alarmTypeId = alarmTypeId;
+    }
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
index 0782c63..ed3b7f4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java
@@ -14,6 +14,7 @@
     private String lowValue;//低限
     private String devType;//设备类型
     private String unit;//单位
+    private String alarmType;//报警类型
 
     public String getId() {
         return id;
@@ -55,13 +56,24 @@
         this.unit = unit;
     }
 
-    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule)
-    {
+    public String getAlarmType() {
+        return alarmType;
+    }
+
+    public void setAlarmType(String alarmType) {
+        this.alarmType = alarmType;
+    }
+
+    public PgAlarmRuleDto(PgAlarmRule pgAlarmRule) {
         this.setId(String.valueOf(pgAlarmRule.getId()));
         this.setHighValue(pgAlarmRule.getHighValue());
         this.setLowValue(pgAlarmRule.getLowValue());
         this.setDevType(pgAlarmRule.getDevType());
         this.setUnit(pgAlarmRule.getUnit());
+        if (pgAlarmRule.getAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgAlarmRule.getAlarmTypeId().getAlarmType());
     }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
index 84e5cdd..34cf237 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java
@@ -4,6 +4,7 @@
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,7 @@
     //根据设备获取设备报警阈值
     public List<PgAlarmRuleDto>  getAlarmRuleDto() {
         Criteria criteria=createCriteria(PgAlarmRule.class);
+        criteria.addOrder(Order.desc("id"));
 
         List<PgAlarmRule> pgAlarmRuleList=criteria.list();
         List<PgAlarmRuleDto> pgAlarmRuleDtoList = new ArrayList<PgAlarmRuleDto>();
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
index 8a15d78..bd4857d 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/domain/PgReservePlan.java
@@ -19,7 +19,7 @@
     private String planName;//预案名称
     private String planType;//预案类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private int active;//状态位
     private PgAlarmType pgAlarmTypeId;//报警类型
 
@@ -72,12 +72,12 @@
     }
 
     @Column(name = "PLAN_FIEL")
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     @Column(name = "ACTIVE")
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
index bac1984..27f6739 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java
@@ -14,7 +14,7 @@
     private String planType;//预案类型
     private String alarmType;//报警类型
     private String resUnit;//责任单位
-    private String planFiel;//预案文档
+    private String planFile;//预案文档
     private String active;//状态位
 
     public String getId() {
@@ -57,12 +57,12 @@
         this.resUnit = resUnit;
     }
 
-    public String getPlanFiel() {
-        return planFiel;
+    public String getPlanFile() {
+        return planFile;
     }
 
-    public void setPlanFiel(String planFiel) {
-        this.planFiel = planFiel;
+    public void setPlanFile(String planFile) {
+        this.planFile = planFile;
     }
 
     public String getActive() {
@@ -73,13 +73,16 @@
         this.active = active;
     }
 
-    public PgReservePlanDto(PgReservePlan pgReservePlan)
-    {
+    public PgReservePlanDto(PgReservePlan pgReservePlan) {
         this.setPlanName(pgReservePlan.getPlanName());
         this.setPlanType(pgReservePlan.getPlanType());
-        this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
+        if (pgReservePlan.getPgAlarmTypeId() == null)
+            this.setAlarmType("");
+        else
+            this.setAlarmType(pgReservePlan.getPgAlarmTypeId().getAlarmType());
         this.setResUnit(pgReservePlan.getResUnit());
-        this.setPlanFiel(pgReservePlan.getPlanFiel());
+        this.setPlanFile(pgReservePlan.getPlanFile());
         this.setActive(String.valueOf(pgReservePlan.getActive()));
     }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
index 365737e..ce7a713 100644
--- a/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
+++ b/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java
@@ -7,14 +7,16 @@
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import sun.misc.BASE64Decoder;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -24,6 +26,17 @@
 @Service
 public class PgReservePlanManager extends HibernateEntityDao<PgReservePlan> {
 
+    public List<PgReservePlanDto> getpgReservePlanDto() {
+        Criteria criteria=createCriteria(PgReservePlan.class);
+
+        List<PgReservePlan> pgReservePlanList=criteria.list();
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        for (PgReservePlan pgReservePlan : pgReservePlanList) {
+            pgReservePlanDtoList.add(new PgReservePlanDto(pgReservePlan));
+        }
+        return pgReservePlanDtoList;
+    }
+
     public  String saveFiles(String fileBuffer, String fileName, String fileType){
 
         try {
@@ -52,10 +65,7 @@
         }
     }
 
-
-
-    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm)
-    {
+    public List<PgReservePlanDto> getReservePlanDtoByAlarmType(PgAlarm pgAlarm){
         try {
             Criteria criteria = createCriteria(PgReservePlan.class);
             criteria.add(Restrictions.eq("pgAlarmTypeId", pgAlarm.getAlarmTypeId()));
@@ -77,5 +87,40 @@
         }
     }
 
+    public boolean getPgReservePlanByFileName(String planName)
+    {
+        String sql="select count(*) from PG_RESERVE_PLAN where PLAN_NAME = '" +planName+"'";
+
+        Object object=this.getSession().createSQLQuery(sql).uniqueResult();
+
+        if(object==null)
+            return false;
+        else
+            return true;
+    }
+
+    /*下载文件*/
+    public ResponseEntity<byte[]> downloadFile(PgReservePlan pgReservePlan) throws Exception {
+        try {
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String path = request.getSession().getServletContext().getRealPath("");
+            String filePath = path + "\\"+pgReservePlan.getPlanFile();
+            File file = new File(filePath);//找到具体的文件
+            byte[] body = null;
+            InputStream inputStream = new FileInputStream(file);
+            body = new byte[inputStream.available()];
+            inputStream.read(body);
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("Content-Disposition",file.getName());
+            HttpStatus status = HttpStatus.OK;
+            ResponseEntity<byte[]> entity = new ResponseEntity<byte[]>(body, headers, status);
+
+            return entity;
+        }
+        catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index d9914a8..2e2fd96 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.patroler.domain.PgAlarmRule;
 import com.casic.PgInterface.patroler.dto.PgAlarmRuleDto;
@@ -30,6 +31,8 @@
 
     private PgDeviceManager pgDeviceManager;
 
+    private PgAlarmTypeManager pgAlarmTypeManager;
+
     private PgAlarmRuleManager pgAlarmRuleManager;
 
     @Resource
@@ -42,6 +45,11 @@
         this.pgDeviceManager = pgDeviceManager;
     }
 
+    @Resource
+    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
+        this.pgAlarmTypeManager = pgAlarmTypeManager;
+    }
+
     /**
      * 新增报警阈值
      */
@@ -51,7 +59,8 @@
     public Map<String, Object> addAlarmRule(@FormParam("highValue") String highValue,
                                             @FormParam("lowValue") String lowValue,
                                             @FormParam("unit") String unit,
-                                            @FormParam("devType") String devType) throws Exception {
+                                            @FormParam("devType") String devType,
+                                            @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -69,6 +78,7 @@
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setDevType(devType);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
 
                 pgAlarmRuleManager.save(pgAlarmRule);
                 result = "true";
@@ -95,7 +105,8 @@
                                              @FormParam("devType") String devType,
                                              @FormParam("highValue") String highValue,
                                              @FormParam("lowValue") String lowValue,
-                                             @FormParam("unit") String unit) throws Exception {
+                                             @FormParam("unit") String unit,
+                                             @FormParam("alarmType") String alarmType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         String result = "";
@@ -112,6 +123,8 @@
                 pgAlarmRule.setHighValue(highValue);
                 pgAlarmRule.setLowValue(lowValue);
                 pgAlarmRule.setUnit(unit);
+                pgAlarmRule.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
+
                 pgAlarmRuleManager.save(pgAlarmRule);
                 msg = "编辑成功";
                 result = "true";
@@ -147,11 +160,46 @@
                 msg = "报警阈值获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "报警信息获取失败";
+            msg = "报警阈值信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmRuleDtoList);
         return resultMap;
     }
 
+    /**
+     * 删除报警阈值
+     */
+    @POST
+    @Path("deleteAlarmRule")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteAlarmRule(@FormParam("id") String id) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        String result = "";
+        PgAlarmRule pgAlarmRule = null;
+
+        try {
+            pgAlarmRule = pgAlarmRuleManager.get(Long.valueOf(id));
+            if (pgAlarmRule == null) {
+                msg = "不存在报警阈值记录";
+                result = "false";
+            } else {
+                pgAlarmRuleManager.remove(pgAlarmRule);
+                msg = "删除成功";
+                result = "true";
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = "false";
+            msg = "报警阈值删除失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", result);
+
+        return resultMap;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
index 260b3ec..eb688c0 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java
@@ -214,18 +214,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgCsDocument pgCsDocument = pgCsDocumentManager.get(Long.valueOf(id));
             path = pgCsDocumentManager.downloadFile(pgCsDocument);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
index 941e633..1398336 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java
@@ -236,6 +236,9 @@
         try{
             PgMaintainDoc pgMaintainDoc = pgMaintainDocManager.get(Long.valueOf(id));
             path = pgMaintainDocManager.downloadFile(pgMaintainDoc);
+            if (path == null)
+                msg = "不存在该文档";
+            else
             msg = "下载成功";
 
         }catch (Exception e){
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
index a4cd71f..f2c49d7 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java
@@ -248,18 +248,20 @@
     @POST
     @Path("fileDownload")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception
-    {
+    public Map<String, Object> downloadFile(@FormParam("id") String id)throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
 
         String msg = "";
         ResponseEntity<byte[]> path = null;
-        try{
+        try {
             PgPatrolDoc pgPatrolDoc = pgPatrolDocManager.get(Long.valueOf(id));
             path = pgPatrolDocManager.downloadFile(pgPatrolDoc);
-            msg = "下载成功";
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             msg = "下载失败";
         }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
index 33da431..9cbb550 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgReservePlanRs.java
@@ -4,7 +4,9 @@
 import com.casic.PgInterface.devTable.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
 import com.casic.PgInterface.reservePlan.domain.PgReservePlan;
+import com.casic.PgInterface.reservePlan.dto.PgReservePlanDto;
 import com.casic.PgInterface.reservePlan.manager.PgReservePlanManager;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,7 +17,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,56 @@
     }
 
     /*
+   * 获取角色信息
+    */
+    @POST
+    @Path("getReservePlan")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getReservePlan() {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgReservePlanDto> pgReservePlanDtoList = new ArrayList<PgReservePlanDto>();
+        try {
+            pgReservePlanDtoList = pgReservePlanManager.getpgReservePlanDto();
+            if (pgReservePlanDtoList == null)
+                msg = "不存在预案信息";
+            else
+                msg = "预案信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "预案信息获取是失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgReservePlanDtoList);
+        return resultMap;
+    }
+
+    @POST
+    @Path("downLoadPlanFile")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> downLoadPlanFile(@FormParam("id") String id) {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+
+        String msg = "";
+        ResponseEntity<byte[]> path = null;
+        try {
+            PgReservePlan pgReservePlan = pgReservePlanManager.get(Long.valueOf(id));
+            path = pgReservePlanManager.downloadFile(pgReservePlan);
+            if (path == null)
+                msg = "不存在该文档";
+            else
+                msg = "下载成功";
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "下载失败";
+        }
+
+        resultMap.put("result", path);
+        resultMap.put("msg", msg);
+        return resultMap;
+    }
+    /*
         新增&上传
      */
     @POST
@@ -48,7 +102,7 @@
     public Map<String,Object> addReservePlan(@FormParam("planName") String planName,
                                              @FormParam("planType") String planType,
                                              @FormParam("resUnit") String resUnit,
-                                             @FormParam("planFiel") String planFiel,
+                                             @FormParam("planFile") String planFile,
                                              @FormParam("alarmType") String alarmType)throws Exception {
 
         Map<String,Object> resultMap=new HashMap<String, Object>();
@@ -59,22 +113,28 @@
 
             PgReservePlan pgReservePlan = new PgReservePlan();
 
-            pgReservePlan.setPlanName(planName);
-            pgReservePlan.setPlanType(planType);
-            pgReservePlan.setResUnit(resUnit);
-            pgReservePlan.setActive(1);
-            PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
-            if (StringUtils.isBlank(planFiel)||StringUtils.isBlank(planName))
-                pgReservePlan.setPlanFiel("");
-            else {
-                pgReservePlan.setPlanFiel(pgReservePlanManager.saveFiles(planFiel, planName, "ReservePlan"));
+            if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+            {
+                msg="已存在同名称文档";
+                result="false";
             }
+            else {
+                pgReservePlan.setPlanName(planName);
+                pgReservePlan.setPlanType(planType);
+                pgReservePlan.setResUnit(resUnit);
+                pgReservePlan.setActive(1);
+                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if (StringUtils.isBlank(planFile) || StringUtils.isBlank(planName))
+                    pgReservePlan.setPlanFile("");
+                else {
+                    pgReservePlan.setPlanFile(pgReservePlanManager.saveFiles(planFile, planName, "ReservePlan"));
+                }
 
-            pgReservePlanManager.save(pgReservePlan);
-            msg="新增成功";
-            result="true";
-
+                pgReservePlanManager.save(pgReservePlan);
+                msg = "新增成功";
+                result = "true";
+            }
         }
         catch(Exception e)
         {
@@ -89,7 +149,6 @@
         return resultMap;
     }
 
-
     //编辑文档
     @RequestMapping("editReservePlan")
     @ResponseBody
@@ -105,20 +164,31 @@
 
         try {
             PgReservePlan pgReservePlan=pgReservePlanManager.get(Long.valueOf(id));
+
             if (pgReservePlan == null) {
                 result = "false";
                 msg = "不存在该预案信息";
             } else {
-                PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
-                pgReservePlan.setPlanName(planName);
-                pgReservePlan.setPlanType(planType);
-                pgReservePlan.setResUnit(resUnit);
-                pgReservePlan.setPgAlarmTypeId(pgAlarmType);
+                if(pgReservePlanManager.getPgReservePlanByFileName(planName))
+                {
+                    msg="已存在同名称文档";
+                    result="false";
+                }
+                else {
+                    PgAlarmType pgAlarmType = pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType);
+                    pgReservePlan.setPlanName(planName);
+                    pgReservePlan.setPlanType(planType);
+                    pgReservePlan.setResUnit(resUnit);
+                    if (pgAlarmType == null)
+                        pgReservePlan.setPgAlarmTypeId(null);
+                    else
+                        pgReservePlan.setPgAlarmTypeId(pgAlarmType);
 
-                pgReservePlanManager.save(pgReservePlan);
+                    pgReservePlanManager.save(pgReservePlan);
 
-                result = "true";
-                msg = "编辑成功";
+                    result = "true";
+                    msg = "编辑成功";
+                }
             }
         } catch (Exception e) {
 
@@ -167,6 +237,4 @@
         return resultMap;
     }
 
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/spring/applicationContext.xml b/src/main/resources/spring/applicationContext.xml
index 2cb05ce..c2e8c69 100644
--- a/src/main/resources/spring/applicationContext.xml
+++ b/src/main/resources/spring/applicationContext.xml
@@ -24,14 +24,14 @@
 		<property name="basenames" value="${application.i18n.packages}"/>
 	</bean>
 
-	<bean class="com.casic.PgInterface.core.logback.JulHandler"/>
+    <bean class="com.casic.PgInterface.core.logback.JulHandler"/>
 
-	<bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
+    <bean id="applicationContextHelper" class="com.casic.PgInterface.core.spring.ApplicationContextHelper"/>
 
-	<bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
+    <bean id="exportor" class="com.casic.PgInterface.core.ext.export.CsvExportor"/>
 
-	<bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
-		<property name="baseDir" value="${store.baseDir}"/>
-	</bean>
+    <bean id="storeConnector" class="com.casic.PgInterface.core.ext.store.FileStoreConnector">
+        <property name="baseDir" value="${store.baseDir}"/>
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 6510e28..c85f677 100644
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 7fa8a50..386a71d 100644
--- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 431e65c..4bd0b78 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index ef5c448..0ccb673 100644
--- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ