diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ea5a93b..2fb8fc1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,8 @@
 <?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="增加统计功能">
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改标注">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -30,8 +31,8 @@
       <file leaf-file-name="PgAlarmTjRs.java" pinned="false" current="true" current-in-tab="true">
         <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.60573477" vertical-offset="1158" max-vertical-offset="1716">
-              <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.44802868" vertical-offset="1114" max-vertical-offset="1672">
+              <caret line="79" column="31" selection-start-line="79" selection-start-column="31" selection-end-line="79" selection-end-column="31" />
               <folding>
                 <element signature="e#2257#2271#0" expanded="true" />
               </folding>
@@ -106,8 +107,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
       </list>
     </option>
   </component>
@@ -168,7 +169,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
+    <option name="x" value="-2" />
     <option name="width" value="1378" />
     <option name="height" value="744" />
   </component>
@@ -200,6 +201,21 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -294,21 +310,6 @@
           </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>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -733,7 +734,8 @@
       <workItem from="1522721287997" duration="7541000" />
       <workItem from="1522802524516" duration="12733000" />
       <workItem from="1523148745408" duration="8835000" />
-      <workItem from="1523157765522" duration="687000" />
+      <workItem from="1523157765522" duration="919000" />
+      <workItem from="1523158719185" duration="34000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -847,11 +849,15 @@
       <created>1523158200071</created>
       <updated>1523158200071</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="修改标注">
+      <created>1523158539385</created>
+      <updated>1523158539385</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="457430000" />
+    <option name="totallyTimeSpent" value="457696000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -874,7 +880,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="744" extended-state="0" />
+    <frame x="-2" y="0" width="1378" height="744" extended-state="0" />
     <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" />
@@ -893,7 +899,6 @@
       <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="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="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" />
@@ -909,6 +914,7 @@
       <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>
@@ -951,7 +957,8 @@
     <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加统计功能" />
+    <MESSAGE value="修改标注" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改标注" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1119,7 +1126,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1246" max-vertical-offset="1804">
           <caret line="115" column="47" selection-start-line="115" selection-start-column="47" selection-end-line="115" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1281,9 +1287,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06989247" vertical-offset="1699" max-vertical-offset="3498">
           <caret line="105" column="37" selection-start-line="105" selection-start-column="37" selection-end-line="105" selection-end-column="37" />
-          <folding>
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1291,9 +1294,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.6550459" vertical-offset="0" max-vertical-offset="1980">
           <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
-          <folding>
-            <element signature="e#2220#2234#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1301,7 +1301,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43369177" vertical-offset="484" max-vertical-offset="1672">
           <caret line="47" column="30" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,12 +1315,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="902">
           <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-          <folding>
-            <element signature="e#496#497#0" expanded="true" />
-            <element signature="e#528#529#0" expanded="true" />
-            <element signature="e#578#579#0" expanded="true" />
-            <element signature="e#620#621#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1336,14 +1329,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-25.269724" vertical-offset="14058" max-vertical-offset="31922">
           <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
-          <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.60573477" vertical-offset="1158" max-vertical-offset="1716">
-          <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.44802868" vertical-offset="1114" max-vertical-offset="1672">
+          <caret line="79" column="31" selection-start-line="79" selection-start-column="31" selection-end-line="79" selection-end-column="31" />
           <folding>
             <element signature="e#2257#2271#0" expanded="true" />
           </folding>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ea5a93b..2fb8fc1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,8 @@
 <?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="增加统计功能">
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="修改标注">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -30,8 +31,8 @@
       <file leaf-file-name="PgAlarmTjRs.java" pinned="false" current="true" current-in-tab="true">
         <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.60573477" vertical-offset="1158" max-vertical-offset="1716">
-              <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+            <state vertical-scroll-proportion="0.44802868" vertical-offset="1114" max-vertical-offset="1672">
+              <caret line="79" column="31" selection-start-line="79" selection-start-column="31" selection-end-line="79" selection-end-column="31" />
               <folding>
                 <element signature="e#2257#2271#0" expanded="true" />
               </folding>
@@ -106,8 +107,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
       </list>
     </option>
   </component>
@@ -168,7 +169,7 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
+    <option name="x" value="-2" />
     <option name="width" value="1378" />
     <option name="height" value="744" />
   </component>
@@ -200,6 +201,21 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -294,21 +310,6 @@
           </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>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -733,7 +734,8 @@
       <workItem from="1522721287997" duration="7541000" />
       <workItem from="1522802524516" duration="12733000" />
       <workItem from="1523148745408" duration="8835000" />
-      <workItem from="1523157765522" duration="687000" />
+      <workItem from="1523157765522" duration="919000" />
+      <workItem from="1523158719185" duration="34000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -847,11 +849,15 @@
       <created>1523158200071</created>
       <updated>1523158200071</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="修改标注">
+      <created>1523158539385</created>
+      <updated>1523158539385</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="457430000" />
+    <option name="totallyTimeSpent" value="457696000" />
   </component>
   <component name="TodoView" selected-index="0">
     <todo-panel id="selected-file">
@@ -874,7 +880,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="0" width="1378" height="744" extended-state="0" />
+    <frame x="-2" y="0" width="1378" height="744" extended-state="0" />
     <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" />
@@ -893,7 +899,6 @@
       <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="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="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" />
@@ -909,6 +914,7 @@
       <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>
@@ -951,7 +957,8 @@
     <MESSAGE value="修改人员入廊记录表和功能" />
     <MESSAGE value="Merge remote-tracking branch 'origin/develop' into develop&#10;&#10;Conflicts:&#10;&#9;.idea/workspace.xml&#10;&#9;~$数据库设计说明新需求.docx&#10;&#9;管廊数据库设计说明新需求.docx&#10;" />
     <MESSAGE value="增加统计功能" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加统计功能" />
+    <MESSAGE value="修改标注" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改标注" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1119,7 +1126,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1246" max-vertical-offset="1804">
           <caret line="115" column="47" selection-start-line="115" selection-start-column="47" selection-end-line="115" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1281,9 +1287,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.06989247" vertical-offset="1699" max-vertical-offset="3498">
           <caret line="105" column="37" selection-start-line="105" selection-start-column="37" selection-end-line="105" selection-end-column="37" />
-          <folding>
-            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1291,9 +1294,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="1.6550459" vertical-offset="0" max-vertical-offset="1980">
           <caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" />
-          <folding>
-            <element signature="e#2220#2234#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1301,7 +1301,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43369177" vertical-offset="484" max-vertical-offset="1672">
           <caret line="47" column="30" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="30" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1316,12 +1315,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.827957" vertical-offset="0" max-vertical-offset="902">
           <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
-          <folding>
-            <element signature="e#496#497#0" expanded="true" />
-            <element signature="e#528#529#0" expanded="true" />
-            <element signature="e#578#579#0" expanded="true" />
-            <element signature="e#620#621#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1336,14 +1329,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-25.269724" vertical-offset="14058" max-vertical-offset="31922">
           <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />
-          <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.60573477" vertical-offset="1158" max-vertical-offset="1716">
-          <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.44802868" vertical-offset="1114" max-vertical-offset="1672">
+          <caret line="79" column="31" selection-start-line="79" selection-start-column="31" selection-end-line="79" selection-end-column="31" />
           <folding>
             <element signature="e#2257#2271#0" expanded="true" />
           </folding>
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
index 5bdc92b..c7d072b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java
@@ -72,18 +72,16 @@
         try {
             pgAlarmTjDtoList = pgAlarmTjManager.getAlarmByTime(startTime, endTime, statisticType);
             if(pgAlarmTjDtoList==null)
-                msg="巡检报警信息获取失败";
+                msg="报警统计信息获取失败";
             else
-                msg="巡检报警信息获取成功";
+                msg="报警统计信息获取成功";
         } catch (Exception e) {
             e.printStackTrace();
-            msg = "巡检报警信息获取失败";
+            msg = "报警统计信息获取失败";
         }
         resultMap.put("msg", msg);
         resultMap.put("result", pgAlarmTjDtoList);
         return resultMap;
     }
 
-
-
 }