diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36c8f6f..e403cd9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改人员入廊记录表和功能">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
-      <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/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\devTable\manager\PgAlarmManager.java" afterPath="" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\rs\PgAlarmRs.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -31,7 +29,18 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+              <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -193,20 +202,6 @@
       <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="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -490,6 +485,20 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </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">
@@ -910,6 +919,7 @@
       <workItem from="1522716581762" duration="2116000" />
       <workItem from="1522720062586" duration="318000" />
       <workItem from="1522720493529" duration="78000" />
+      <workItem from="1522720652490" duration="115000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1003,7 +1013,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="427400000" />
+    <option name="totallyTimeSpent" value="427515000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -1044,13 +1054,14 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" 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="4" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48034188" 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="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.53504276" 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="0" 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.32820514" 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.2620846" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2620846" 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.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1060,7 +1071,6 @@
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.04845815" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="1" 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.48034188" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <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="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>
@@ -1466,12 +1476,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1188">
           <caret line="74" column="22" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
-          <folding>
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select count..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select month..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select daten..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select day(i..." />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1513,26 +1518,10 @@
         </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="2024" max-vertical-offset="3916">
-          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="410" max-vertical-offset="1650">
-          <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
-          <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.6702509" vertical-offset="1188" max-vertical-offset="1804">
-          <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36c8f6f..e403cd9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改人员入廊记录表和功能">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
-      <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/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\devTable\manager\PgAlarmManager.java" afterPath="" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\rs\PgAlarmRs.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -31,7 +29,18 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+              <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -193,20 +202,6 @@
       <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="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -490,6 +485,20 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </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">
@@ -910,6 +919,7 @@
       <workItem from="1522716581762" duration="2116000" />
       <workItem from="1522720062586" duration="318000" />
       <workItem from="1522720493529" duration="78000" />
+      <workItem from="1522720652490" duration="115000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1003,7 +1013,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="427400000" />
+    <option name="totallyTimeSpent" value="427515000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -1044,13 +1054,14 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" 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="4" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48034188" 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="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.53504276" 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="0" 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.32820514" 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.2620846" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2620846" 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.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1060,7 +1071,6 @@
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.04845815" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="1" 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.48034188" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <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="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>
@@ -1466,12 +1476,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1188">
           <caret line="74" column="22" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
-          <folding>
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select count..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select month..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select daten..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select day(i..." />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1513,26 +1518,10 @@
         </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="2024" max-vertical-offset="3916">
-          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="410" max-vertical-offset="1650">
-          <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
-          <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.6702509" vertical-offset="1188" max-vertical-offset="1804">
-          <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
deleted file mode 100644
index dd81cfb..0000000
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.casic.PgInterface.devTable.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.core.util.DateUtils;
-import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devTable.domain.PgAlarm;
-import com.casic.PgInterface.devTable.dto.PgAlarmDto;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-/**
- * Created by yxw on 2017/10/30.
- */
-@Service
-public class PgAlarmManager extends HibernateEntityDao<PgAlarm> {
-
-    private PgAlarmTypeManager pgAlarmTypeManager;
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
-    //获取当前报警消息列表
-    public List<PgAlarmDto> getAllAlarm() {
-        Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
-        criteria.addOrder(Order.desc("id"));
-
-        List<PgAlarm> pgAlarmList = criteria.list();
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        for (PgAlarm pgAlarm : pgAlarmList) {
-            pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-        }
-
-        return pgAlarmDtoList;
-    }
-
-    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime)
-    {
-        try {
-            Criteria criteria = createCriteria(PgAlarm.class);
-            if (StringUtils.isNotBlank(alarmType)) {
-                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
-            }
-
-            if (StringUtils.isNotBlank(startTime)) {
-                criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startTime)));
-            }
-            if (StringUtils.isNotBlank(endTime)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(DateUtils.sdf_day.parse(endTime));
-                calendar.add(Calendar.DATE, 1);
-                criteria.add(Restrictions.le("alarmDate", calendar.getTime()));
-            }
-            criteria.add(Restrictions.eq("active", 1));
-            criteria.addOrder(Order.desc("id"));
-
-            List<PgAlarm> pgAlarmList=criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
-            for(PgAlarm pgAlarm : pgAlarmList)
-            {
-                pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-            }
-
-            return pgAlarmDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36c8f6f..e403cd9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改人员入廊记录表和功能">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
-      <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/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\devTable\manager\PgAlarmManager.java" afterPath="" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\rs\PgAlarmRs.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -31,7 +29,18 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+              <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -193,20 +202,6 @@
       <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="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -490,6 +485,20 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </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">
@@ -910,6 +919,7 @@
       <workItem from="1522716581762" duration="2116000" />
       <workItem from="1522720062586" duration="318000" />
       <workItem from="1522720493529" duration="78000" />
+      <workItem from="1522720652490" duration="115000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1003,7 +1013,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="427400000" />
+    <option name="totallyTimeSpent" value="427515000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -1044,13 +1054,14 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" 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="4" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48034188" 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="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.53504276" 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="0" 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.32820514" 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.2620846" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2620846" 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.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1060,7 +1071,6 @@
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.04845815" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="1" 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.48034188" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <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="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>
@@ -1466,12 +1476,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1188">
           <caret line="74" column="22" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
-          <folding>
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select count..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select month..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select daten..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select day(i..." />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1513,26 +1518,10 @@
         </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="2024" max-vertical-offset="3916">
-          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="410" max-vertical-offset="1650">
-          <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
-          <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.6702509" vertical-offset="1188" max-vertical-offset="1804">
-          <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
deleted file mode 100644
index dd81cfb..0000000
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.casic.PgInterface.devTable.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.core.util.DateUtils;
-import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devTable.domain.PgAlarm;
-import com.casic.PgInterface.devTable.dto.PgAlarmDto;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-/**
- * Created by yxw on 2017/10/30.
- */
-@Service
-public class PgAlarmManager extends HibernateEntityDao<PgAlarm> {
-
-    private PgAlarmTypeManager pgAlarmTypeManager;
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
-    //获取当前报警消息列表
-    public List<PgAlarmDto> getAllAlarm() {
-        Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
-        criteria.addOrder(Order.desc("id"));
-
-        List<PgAlarm> pgAlarmList = criteria.list();
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        for (PgAlarm pgAlarm : pgAlarmList) {
-            pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-        }
-
-        return pgAlarmDtoList;
-    }
-
-    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime)
-    {
-        try {
-            Criteria criteria = createCriteria(PgAlarm.class);
-            if (StringUtils.isNotBlank(alarmType)) {
-                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
-            }
-
-            if (StringUtils.isNotBlank(startTime)) {
-                criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startTime)));
-            }
-            if (StringUtils.isNotBlank(endTime)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(DateUtils.sdf_day.parse(endTime));
-                calendar.add(Calendar.DATE, 1);
-                criteria.add(Restrictions.le("alarmDate", calendar.getTime()));
-            }
-            criteria.add(Restrictions.eq("active", 1));
-            criteria.addOrder(Order.desc("id"));
-
-            List<PgAlarm> pgAlarmList=criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
-            for(PgAlarm pgAlarm : pgAlarmList)
-            {
-                pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-            }
-
-            return pgAlarmDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
deleted file mode 100644
index c7b2961..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.devTable.domain.PgAlarm;
-import com.casic.PgInterface.devTable.dto.PgAlarmDto;
-import com.casic.PgInterface.devTable.manager.PgAlarmManager;
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
-import com.casic.PgInterface.patroler.manager.PgUserManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by yxw on 2017/11/4.
- */
-@Component
-@Path("pgAlarm")
-public class PgAlarmRs {
-
-    private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
-
-    private PgAlarmTypeManager pgAlarmTypeManager;
-
-    private PgAlarmManager pgAlarmManager;
-
-    private PgUserManager pgPatrolerManager;
-
-    private PgDeviceManager pgDeviceManager;
-
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
-    /**
-     * 获取报警信息
-     */
-    @POST
-    @Path("getAlarmInfo")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm();
-            if (pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息获取失败";
-        }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
-        return resultMap;
-    }
-
-    /**
-     * 消除报警信息
-     */
-    @POST
-    @Path("clearAlarmInfo")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "false";
-
-        try {
-            PgAlarm pgAlarm = new PgAlarm();
-            pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            if (pgAlarm == null) {
-                msg = "不存在该报警信息";
-                result = "false";
-            } else {
-                pgAlarm.setActive(0);
-                pgAlarmManager.save(pgAlarm);
-                msg = "报警信息清除成功";
-                result = "true";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息清除失败";
-            result = "false";
-        }
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 新增报警
-     */
-    @POST
-    @Path("addAlarm")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarm(@FormParam("alarmType") String alarmType,
-                                        @FormParam("alarmValue") String alarmValue,
-                                        @FormParam("alarmDate") String alarmDate,
-                                        @FormParam("description") String description,
-                                        @FormParam("devCode") String devCode,
-                                        @FormParam("userName") String userName) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            PgAlarm pgAlarm = new PgAlarm();
-            if (!pgPatrolerManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "不存在该用户!";
-            } else {
-                pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-                pgAlarm.setAlarmValue(alarmValue);
-                pgAlarm.setAlarmDate(sdf.parse(alarmDate));
-                pgAlarm.setDescription(description);
-                pgAlarm.setUserId(pgPatrolerManager.getPatrolerByuserName(userName));
-                pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode));
-                pgAlarm.setActive(1);
-
-                logger.info("成功保存");
-                pgAlarmManager.save(pgAlarm);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /*
-    * 根据报警类型和时间查询报警记录
-     */
-    @POST
-    @Path("getAlarmByTypeOrTime")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
-                                                    @FormParam("startTime") String startTime,
-                                                    @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        try {
-            pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
-            if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
-                msg = "报警信息不存在";
-            else
-                msg = "报警信息获取成功";
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
-
-        return resultMap;
-    }
-
-}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 36c8f6f..e403cd9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改人员入廊记录表和功能">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$数据库设计说明新需求.docx" afterPath="" />
-      <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/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$数据库设计说明新需求.docx" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\devTable\manager\PgAlarmManager.java" afterPath="" />
+      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\java\com\casic\PgInterface\rs\PgAlarmRs.java" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -31,7 +29,18 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <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">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+              <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -193,20 +202,6 @@
       <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="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -490,6 +485,20 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </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">
@@ -910,6 +919,7 @@
       <workItem from="1522716581762" duration="2116000" />
       <workItem from="1522720062586" duration="318000" />
       <workItem from="1522720493529" duration="78000" />
+      <workItem from="1522720652490" duration="115000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1003,7 +1013,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="427400000" />
+    <option name="totallyTimeSpent" value="427515000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -1044,13 +1054,14 @@
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50427353" 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="4" 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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48034188" 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="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.53504276" 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="0" 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.32820514" 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.2620846" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2620846" 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.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1060,7 +1071,6 @@
       <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.04845815" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32820514" sideWeight="0.5" order="1" 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.48034188" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <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="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>
@@ -1466,12 +1476,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1188">
           <caret line="74" column="22" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
-          <folding>
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select count..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select month..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select daten..PgInPgPerson..." />
-            <marker date="1522665082517" expanded="true" signature="-1:-1" placeholder="select day(i..." />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1513,26 +1518,10 @@
         </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="2024" max-vertical-offset="3916">
-          <caret line="119" column="0" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="410" max-vertical-offset="1650">
-          <caret line="43" column="5" selection-start-line="43" selection-start-column="5" selection-end-line="43" selection-end-column="5" />
-          <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.6702509" vertical-offset="1188" max-vertical-offset="1804">
-          <caret line="114" column="0" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.8736462" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
deleted file mode 100644
index dd81cfb..0000000
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.casic.PgInterface.devTable.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.core.util.DateUtils;
-import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devTable.domain.PgAlarm;
-import com.casic.PgInterface.devTable.dto.PgAlarmDto;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-/**
- * Created by yxw on 2017/10/30.
- */
-@Service
-public class PgAlarmManager extends HibernateEntityDao<PgAlarm> {
-
-    private PgAlarmTypeManager pgAlarmTypeManager;
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
-    //获取当前报警消息列表
-    public List<PgAlarmDto> getAllAlarm() {
-        Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
-        criteria.addOrder(Order.desc("id"));
-
-        List<PgAlarm> pgAlarmList = criteria.list();
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        for (PgAlarm pgAlarm : pgAlarmList) {
-            pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-        }
-
-        return pgAlarmDtoList;
-    }
-
-    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime)
-    {
-        try {
-            Criteria criteria = createCriteria(PgAlarm.class);
-            if (StringUtils.isNotBlank(alarmType)) {
-                criteria.add(Restrictions.eq("alarmTypeId", pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType)));
-            }
-
-            if (StringUtils.isNotBlank(startTime)) {
-                criteria.add(Restrictions.ge("alarmDate", DateUtils.sdf_day.parse(startTime)));
-            }
-            if (StringUtils.isNotBlank(endTime)) {
-                Calendar calendar = Calendar.getInstance();
-                calendar.setTime(DateUtils.sdf_day.parse(endTime));
-                calendar.add(Calendar.DATE, 1);
-                criteria.add(Restrictions.le("alarmDate", calendar.getTime()));
-            }
-            criteria.add(Restrictions.eq("active", 1));
-            criteria.addOrder(Order.desc("id"));
-
-            List<PgAlarm> pgAlarmList=criteria.list();
-            List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
-            for(PgAlarm pgAlarm : pgAlarmList)
-            {
-                pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
-            }
-
-            return pgAlarmDtoList;
-        }
-        catch(Exception e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
deleted file mode 100644
index c7b2961..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.devTable.domain.PgAlarm;
-import com.casic.PgInterface.devTable.dto.PgAlarmDto;
-import com.casic.PgInterface.devTable.manager.PgAlarmManager;
-import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager;
-import com.casic.PgInterface.devTable.manager.PgDeviceManager;
-import com.casic.PgInterface.patroler.manager.PgUserManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by yxw on 2017/11/4.
- */
-@Component
-@Path("pgAlarm")
-public class PgAlarmRs {
-
-    private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
-
-    private PgAlarmTypeManager pgAlarmTypeManager;
-
-    private PgAlarmManager pgAlarmManager;
-
-    private PgUserManager pgPatrolerManager;
-
-    private PgDeviceManager pgDeviceManager;
-
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
-    /**
-     * 获取报警信息
-     */
-    @POST
-    @Path("getAlarmInfo")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmList() throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        try {
-            pgAlarmDtoList = pgAlarmManager.getAllAlarm();
-            if (pgAlarmDtoList.size() == 0)
-                msg = "没有报警信息";
-            else
-                msg = "报警信息获取成功";
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息获取失败";
-        }
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
-        return resultMap;
-    }
-
-    /**
-     * 消除报警信息
-     */
-    @POST
-    @Path("clearAlarmInfo")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> clearAlarmList(@FormParam("id") String id) throws Exception {
-
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-        String result = "false";
-
-        try {
-            PgAlarm pgAlarm = new PgAlarm();
-            pgAlarm = pgAlarmManager.get(Long.valueOf(id));
-            if (pgAlarm == null) {
-                msg = "不存在该报警信息";
-                result = "false";
-            } else {
-                pgAlarm.setActive(0);
-                pgAlarmManager.save(pgAlarm);
-                msg = "报警信息清除成功";
-                result = "true";
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息清除失败";
-            result = "false";
-        }
-        resultMap.put("msg", msg);
-        resultMap.put("result", result);
-        return resultMap;
-    }
-
-    /**
-     * 新增报警
-     */
-    @POST
-    @Path("addAlarm")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> addAlarm(@FormParam("alarmType") String alarmType,
-                                        @FormParam("alarmValue") String alarmValue,
-                                        @FormParam("alarmDate") String alarmDate,
-                                        @FormParam("description") String description,
-                                        @FormParam("devCode") String devCode,
-                                        @FormParam("userName") String userName) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String result = "";
-        String msg = "";
-
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            PgAlarm pgAlarm = new PgAlarm();
-            if (!pgPatrolerManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "不存在该用户!";
-            } else {
-                pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
-                pgAlarm.setAlarmValue(alarmValue);
-                pgAlarm.setAlarmDate(sdf.parse(alarmDate));
-                pgAlarm.setDescription(description);
-                pgAlarm.setUserId(pgPatrolerManager.getPatrolerByuserName(userName));
-                pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode));
-                pgAlarm.setActive(1);
-
-                logger.info("成功保存");
-                pgAlarmManager.save(pgAlarm);
-                result = "true";
-                msg = "保存成功";
-            }
-        } catch (Exception e) {
-            result = "false";
-            msg = "保存失败";
-            e.printStackTrace();
-        }
-
-        resultMap.put("result", result);
-        resultMap.put("msg", msg);
-        return resultMap;
-    }
-
-    /*
-    * 根据报警类型和时间查询报警记录
-     */
-    @POST
-    @Path("getAlarmByTypeOrTime")
-    @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getAlarmByTypeOrTime(@FormParam("alarmType") String alarmType,
-                                                    @FormParam("startTime") String startTime,
-                                                    @FormParam("endTime") String endTime) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
-        String msg = "";
-
-        List<PgAlarmDto> pgAlarmDtoList = new ArrayList<PgAlarmDto>();
-        try {
-            pgAlarmDtoList = pgAlarmManager.getAlarmByTypeAndTime(alarmType, startTime, endTime);
-            if (pgAlarmDtoList == null || pgAlarmDtoList.size() == 0)
-                msg = "报警信息不存在";
-            else
-                msg = "报警信息获取成功";
-        } catch (Exception e) {
-            e.printStackTrace();
-            msg = "报警信息获取失败";
-        }
-
-        resultMap.put("msg", msg);
-        resultMap.put("result", pgAlarmDtoList);
-
-        return resultMap;
-    }
-
-}
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
new file mode 100644
index 0000000..2de346f
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ