diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5b9489..d49dc00 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,9 @@
 <?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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -34,25 +28,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgOverViewRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-              <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
-              <folding>
-                <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -75,7 +51,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgALarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
@@ -113,13 +88,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.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/patroler/manager/PgMaintainManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
@@ -181,8 +157,8 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="-11" />
+    <option name="y" value="-2" />
     <option name="width" value="1378" />
     <option name="height" value="744" />
   </component>
@@ -336,6 +312,108 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="manager" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane">
@@ -779,7 +857,7 @@
       <workItem from="1523148745408" duration="8835000" />
       <workItem from="1523157765522" duration="919000" />
       <workItem from="1523158719185" duration="18552000" />
-      <workItem from="1523237655585" duration="39000" />
+      <workItem from="1523237655585" duration="6708000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -901,11 +979,15 @@
       <created>1523158771384</created>
       <updated>1523158771384</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="修改年月日统计问题">
+      <created>1523237727191</created>
+      <updated>1523237727191</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="476253000" />
+    <option name="totallyTimeSpent" value="482922000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -928,7 +1010,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1378" height="744" extended-state="0" />
+    <frame x="-11" y="-2" 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" />
@@ -947,13 +1029,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3948718" 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.5623932" 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.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29393938" 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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -962,7 +1045,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.3948718" 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>
@@ -1006,7 +1088,8 @@
     <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="增加统计功能" />
     <MESSAGE value="修改标注" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改标注" />
+    <MESSAGE value="修改年月日统计问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改年月日统计问题" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1026,20 +1109,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.72401434" vertical-offset="2720" max-vertical-offset="3806">
-          <caret line="142" column="27" selection-start-line="142" selection-start-column="11" selection-end-line="142" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="718" max-vertical-offset="1364">
-          <caret line="48" column="38" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.31376147" vertical-offset="423" max-vertical-offset="1122">
@@ -1121,20 +1190,6 @@
         </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.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" />
-        </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="1092" max-vertical-offset="1650">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6702509" vertical-offset="0" max-vertical-offset="2420">
@@ -1219,24 +1274,11 @@
         </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.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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <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>
@@ -1258,6 +1300,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28107074" vertical-offset="161" max-vertical-offset="1034">
           <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1265,13 +1308,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43369177" vertical-offset="0" max-vertical-offset="902">
           <caret line="13" column="33" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="784" max-vertical-offset="1386">
-          <caret line="64" column="2" selection-start-line="64" selection-start-column="2" selection-end-line="64" selection-end-column="2" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1308,6 +1345,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="528">
           <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1315,13 +1353,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1202" max-vertical-offset="1870">
           <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26119402" vertical-offset="14" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1329,6 +1361,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.48387095" vertical-offset="3492" max-vertical-offset="4202">
           <caret line="187" column="74" selection-start-line="187" selection-start-column="74" selection-end-line="187" selection-end-column="74" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1336,6 +1369,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.64220184" vertical-offset="1586" max-vertical-offset="2288">
           <caret line="101" column="90" selection-start-line="101" selection-start-column="90" selection-end-line="101" selection-end-column="90" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1343,6 +1377,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17204301" vertical-offset="3622" max-vertical-offset="4180">
           <caret line="187" column="65" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1350,6 +1385,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5614679" vertical-offset="1674" max-vertical-offset="2332">
           <caret line="103" column="91" selection-start-line="103" selection-start-column="91" selection-end-line="103" selection-end-column="91" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1357,6 +1393,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56630826" vertical-offset="4766" max-vertical-offset="5522">
           <caret line="245" column="60" selection-start-line="245" selection-start-column="60" selection-end-line="245" selection-end-column="60" />
+          <folding>
+            <element signature="e#7908#7923#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1364,6 +1403,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1032" max-vertical-offset="2156">
           <caret line="66" column="31" selection-start-line="66" selection-start-column="31" selection-end-line="66" selection-end-column="31" />
+          <folding>
+            <element signature="e#2560#2575#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1371,6 +1413,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.332696" vertical-offset="838" max-vertical-offset="2002">
           <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
+          <folding>
+            <element signature="e#2170#2184#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1378,24 +1423,123 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.68458784" vertical-offset="1114" max-vertical-offset="1672">
           <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.493578" vertical-offset="39" max-vertical-offset="1122">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="298" max-vertical-offset="1738">
+          <caret line="51" column="15" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
+          <folding>
+            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="e#2483#2498#0" expanded="true" />
+            <element signature="e#3204#3219#0" expanded="true" />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1259" max-vertical-offset="1804">
+          <caret line="131" column="97" selection-start-line="131" selection-start-column="97" selection-end-line="131" selection-end-column="97" />
+          <folding>
+            <element signature="method#getAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="111" column="69" selection-start-line="111" selection-start-column="69" selection-end-line="111" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1276">
+          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="814">
+          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-          <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.23302752" vertical-offset="2711" max-vertical-offset="3410">
+          <caret line="252" column="23" selection-start-line="252" selection-start-column="11" selection-end-line="252" selection-end-column="23" />
           <folding>
+            <element signature="imports" expanded="true" />
             <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#1689#1705#0" expanded="true" />
             <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2347#2363#0" expanded="true" />
             <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3000#3016#0" expanded="true" />
+            <element signature="e#3107#3122#0" expanded="true" />
             <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3800#3816#0" expanded="true" />
+            <element signature="e#3907#3922#0" expanded="true" />
+            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#4507#4523#0" expanded="true" />
+            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5164#5180#0" expanded="true" />
+            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5847#5863#0" expanded="true" />
+            <element signature="e#6539#6555#0" expanded="true" />
+            <element signature="e#6644#6658#0" expanded="true" />
+            <element signature="e#7372#7388#0" expanded="true" />
+            <element signature="e#7470#7482#0" expanded="true" />
           </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.76344085" vertical-offset="1840" max-vertical-offset="2486">
+          <caret line="165" column="29" selection-start-line="165" selection-start-column="15" selection-end-line="165" selection-end-column="29" />
+          <folding>
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4662#4676#0" expanded="true" />
+            <element signature="e#6035#6047#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18899083" vertical-offset="271" max-vertical-offset="1672">
+          <caret line="23" column="35" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5b9489..d49dc00 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,9 @@
 <?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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -34,25 +28,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgOverViewRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-              <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
-              <folding>
-                <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -75,7 +51,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgALarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
@@ -113,13 +88,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.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/patroler/manager/PgMaintainManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
@@ -181,8 +157,8 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="-11" />
+    <option name="y" value="-2" />
     <option name="width" value="1378" />
     <option name="height" value="744" />
   </component>
@@ -336,6 +312,108 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="manager" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane">
@@ -779,7 +857,7 @@
       <workItem from="1523148745408" duration="8835000" />
       <workItem from="1523157765522" duration="919000" />
       <workItem from="1523158719185" duration="18552000" />
-      <workItem from="1523237655585" duration="39000" />
+      <workItem from="1523237655585" duration="6708000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -901,11 +979,15 @@
       <created>1523158771384</created>
       <updated>1523158771384</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="修改年月日统计问题">
+      <created>1523237727191</created>
+      <updated>1523237727191</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="476253000" />
+    <option name="totallyTimeSpent" value="482922000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -928,7 +1010,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1378" height="744" extended-state="0" />
+    <frame x="-11" y="-2" 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" />
@@ -947,13 +1029,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3948718" 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.5623932" 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.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29393938" 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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -962,7 +1045,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.3948718" 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>
@@ -1006,7 +1088,8 @@
     <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="增加统计功能" />
     <MESSAGE value="修改标注" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改标注" />
+    <MESSAGE value="修改年月日统计问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改年月日统计问题" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1026,20 +1109,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.72401434" vertical-offset="2720" max-vertical-offset="3806">
-          <caret line="142" column="27" selection-start-line="142" selection-start-column="11" selection-end-line="142" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="718" max-vertical-offset="1364">
-          <caret line="48" column="38" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.31376147" vertical-offset="423" max-vertical-offset="1122">
@@ -1121,20 +1190,6 @@
         </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.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" />
-        </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="1092" max-vertical-offset="1650">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6702509" vertical-offset="0" max-vertical-offset="2420">
@@ -1219,24 +1274,11 @@
         </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.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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <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>
@@ -1258,6 +1300,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28107074" vertical-offset="161" max-vertical-offset="1034">
           <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1265,13 +1308,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43369177" vertical-offset="0" max-vertical-offset="902">
           <caret line="13" column="33" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="784" max-vertical-offset="1386">
-          <caret line="64" column="2" selection-start-line="64" selection-start-column="2" selection-end-line="64" selection-end-column="2" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1308,6 +1345,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="528">
           <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1315,13 +1353,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1202" max-vertical-offset="1870">
           <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26119402" vertical-offset="14" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1329,6 +1361,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.48387095" vertical-offset="3492" max-vertical-offset="4202">
           <caret line="187" column="74" selection-start-line="187" selection-start-column="74" selection-end-line="187" selection-end-column="74" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1336,6 +1369,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.64220184" vertical-offset="1586" max-vertical-offset="2288">
           <caret line="101" column="90" selection-start-line="101" selection-start-column="90" selection-end-line="101" selection-end-column="90" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1343,6 +1377,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17204301" vertical-offset="3622" max-vertical-offset="4180">
           <caret line="187" column="65" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1350,6 +1385,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5614679" vertical-offset="1674" max-vertical-offset="2332">
           <caret line="103" column="91" selection-start-line="103" selection-start-column="91" selection-end-line="103" selection-end-column="91" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1357,6 +1393,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56630826" vertical-offset="4766" max-vertical-offset="5522">
           <caret line="245" column="60" selection-start-line="245" selection-start-column="60" selection-end-line="245" selection-end-column="60" />
+          <folding>
+            <element signature="e#7908#7923#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1364,6 +1403,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1032" max-vertical-offset="2156">
           <caret line="66" column="31" selection-start-line="66" selection-start-column="31" selection-end-line="66" selection-end-column="31" />
+          <folding>
+            <element signature="e#2560#2575#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1371,6 +1413,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.332696" vertical-offset="838" max-vertical-offset="2002">
           <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
+          <folding>
+            <element signature="e#2170#2184#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1378,24 +1423,123 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.68458784" vertical-offset="1114" max-vertical-offset="1672">
           <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.493578" vertical-offset="39" max-vertical-offset="1122">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="298" max-vertical-offset="1738">
+          <caret line="51" column="15" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
+          <folding>
+            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="e#2483#2498#0" expanded="true" />
+            <element signature="e#3204#3219#0" expanded="true" />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1259" max-vertical-offset="1804">
+          <caret line="131" column="97" selection-start-line="131" selection-start-column="97" selection-end-line="131" selection-end-column="97" />
+          <folding>
+            <element signature="method#getAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="111" column="69" selection-start-line="111" selection-start-column="69" selection-end-line="111" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1276">
+          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="814">
+          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-          <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.23302752" vertical-offset="2711" max-vertical-offset="3410">
+          <caret line="252" column="23" selection-start-line="252" selection-start-column="11" selection-end-line="252" selection-end-column="23" />
           <folding>
+            <element signature="imports" expanded="true" />
             <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#1689#1705#0" expanded="true" />
             <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2347#2363#0" expanded="true" />
             <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3000#3016#0" expanded="true" />
+            <element signature="e#3107#3122#0" expanded="true" />
             <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3800#3816#0" expanded="true" />
+            <element signature="e#3907#3922#0" expanded="true" />
+            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#4507#4523#0" expanded="true" />
+            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5164#5180#0" expanded="true" />
+            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5847#5863#0" expanded="true" />
+            <element signature="e#6539#6555#0" expanded="true" />
+            <element signature="e#6644#6658#0" expanded="true" />
+            <element signature="e#7372#7388#0" expanded="true" />
+            <element signature="e#7470#7482#0" expanded="true" />
           </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.76344085" vertical-offset="1840" max-vertical-offset="2486">
+          <caret line="165" column="29" selection-start-line="165" selection-start-column="15" selection-end-line="165" selection-end-column="29" />
+          <folding>
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4662#4676#0" expanded="true" />
+            <element signature="e#6035#6047#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18899083" vertical-offset="271" max-vertical-offset="1672">
+          <caret line="23" column="35" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index dd81cfb..85789a0 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -4,7 +4,10 @@
 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.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.dto.PgAlarmDto;
+import com.casic.PgInterface.devTable.dto.PgAlarmTjDto;
+import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,6 +16,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,8 +47,7 @@
         return pgAlarmDtoList;
     }
 
-    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime)
-    {
+    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){
         try {
             Criteria criteria = createCriteria(PgAlarm.class);
             if (StringUtils.isNotBlank(alarmType)) {
@@ -79,4 +82,88 @@
         }
     }
 
+    public int getAlarmNum(String isDevFault) {
+        String hql = "select count(*) from PgAlarm pgAlarm ";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.valueOf(object.toString());
+    }
+
+    public int getMonthAlarmNum(String isDevFault) {
+
+        String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" +
+                " = to_char(" + new Date() + ",'yyyy-mm')";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.parseInt(String.valueOf(object));
+    }
+
+    public int getWeekAlarmNum(String isDevFault) {
+        String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" +
+                " = to_char(" + new Date() + ",'iw')";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.parseInt(String.valueOf(object));
+    }
+
+    public List<PgAlarmTjDto> getDayAlarmStatistic(String isDevFault) {
+
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+
+        String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')";
+
+        List<Object[]> objects = this.getSession().createQuery(hql).list();
+        for (int i = 0; i < objects.size(); i++) {
+            PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto();
+            pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString());
+            pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString());
+            pgAlarmTjDtoList.add(pgAlarmTjDto);
+        }
+        return pgAlarmTjDtoList;
+    }
+
+    public List<PgAlarmDto> getAlarmList(String isDevFault) {
+
+        PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警");
+
+        Criteria criteria=createCriteria(PgAlarm.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        if(isDevFault.equals("true"))
+            criteria.add(Restrictions.eq("alarmTypeId",pgAlarmType));
+        else
+            criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType));
+
+        List<PgAlarm> pgAlarmList = criteria.list();
+        List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
+        for(PgAlarm pgAlarm : pgAlarmList)
+        {
+            pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
+        }
+
+        return pgAlarmDtoList;
+    }
+
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5b9489..d49dc00 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,15 +1,9 @@
 <?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="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+    <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -34,25 +28,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgOverViewRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-              <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
-              <folding>
-                <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
-                <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -75,7 +51,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgReserveController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgALarmLinkRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/reservePlan/manager/PgReservePlanManager.java" />
@@ -113,13 +88,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java" />
         <option value="$PROJECT_DIR$/.idea/workspace.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/util/DateUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.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/patroler/manager/PgMaintainManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
@@ -181,8 +157,8 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
+    <option name="x" value="-11" />
+    <option name="y" value="-2" />
     <option name="width" value="1378" />
     <option name="height" value="744" />
   </component>
@@ -336,6 +312,108 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="manager" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="dto" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="devTable" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="domain" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane">
@@ -779,7 +857,7 @@
       <workItem from="1523148745408" duration="8835000" />
       <workItem from="1523157765522" duration="919000" />
       <workItem from="1523158719185" duration="18552000" />
-      <workItem from="1523237655585" duration="39000" />
+      <workItem from="1523237655585" duration="6708000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -901,11 +979,15 @@
       <created>1523158771384</created>
       <updated>1523158771384</updated>
     </task>
-    <option name="localTasksCounter" value="31" />
+    <task id="LOCAL-00031" summary="修改年月日统计问题">
+      <created>1523237727191</created>
+      <updated>1523237727191</updated>
+    </task>
+    <option name="localTasksCounter" value="32" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="476253000" />
+    <option name="totallyTimeSpent" value="482922000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -928,7 +1010,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1378" height="744" extended-state="0" />
+    <frame x="-11" y="-2" 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" />
@@ -947,13 +1029,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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3948718" 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.5623932" 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.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.29393938" 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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
@@ -962,7 +1045,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.3948718" 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>
@@ -1006,7 +1088,8 @@
     <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="增加统计功能" />
     <MESSAGE value="修改标注" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改标注" />
+    <MESSAGE value="修改年月日统计问题" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改年月日统计问题" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1026,20 +1109,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.72401434" vertical-offset="2720" max-vertical-offset="3806">
-          <caret line="142" column="27" selection-start-line="142" selection-start-column="11" selection-end-line="142" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="718" max-vertical-offset="1364">
-          <caret line="48" column="38" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgAuthority.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.31376147" vertical-offset="423" max-vertical-offset="1122">
@@ -1121,20 +1190,6 @@
         </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.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" />
-        </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="1092" max-vertical-offset="1650">
-          <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.6702509" vertical-offset="0" max-vertical-offset="2420">
@@ -1219,24 +1274,11 @@
         </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.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" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <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>
@@ -1258,6 +1300,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28107074" vertical-offset="161" max-vertical-offset="1034">
           <caret line="19" column="30" selection-start-line="19" selection-start-column="30" selection-end-line="19" selection-end-column="30" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1265,13 +1308,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.43369177" vertical-offset="0" max-vertical-offset="902">
           <caret line="13" column="33" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="784" max-vertical-offset="1386">
-          <caret line="64" column="2" selection-start-line="64" selection-start-column="2" selection-end-line="64" selection-end-column="2" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1308,6 +1345,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="528">
           <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1315,13 +1353,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1202" max-vertical-offset="1870">
           <caret line="108" column="0" selection-start-line="108" selection-start-column="0" selection-end-line="108" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.26119402" vertical-offset="14" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1329,6 +1361,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.48387095" vertical-offset="3492" max-vertical-offset="4202">
           <caret line="187" column="74" selection-start-line="187" selection-start-column="74" selection-end-line="187" selection-end-column="74" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1336,6 +1369,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.64220184" vertical-offset="1586" max-vertical-offset="2288">
           <caret line="101" column="90" selection-start-line="101" selection-start-column="90" selection-end-line="101" selection-end-column="90" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1343,6 +1377,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.17204301" vertical-offset="3622" max-vertical-offset="4180">
           <caret line="187" column="65" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1350,6 +1385,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5614679" vertical-offset="1674" max-vertical-offset="2332">
           <caret line="103" column="91" selection-start-line="103" selection-start-column="91" selection-end-line="103" selection-end-column="91" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1357,6 +1393,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56630826" vertical-offset="4766" max-vertical-offset="5522">
           <caret line="245" column="60" selection-start-line="245" selection-start-column="60" selection-end-line="245" selection-end-column="60" />
+          <folding>
+            <element signature="e#7908#7923#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1364,6 +1403,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1032" max-vertical-offset="2156">
           <caret line="66" column="31" selection-start-line="66" selection-start-column="31" selection-end-line="66" selection-end-column="31" />
+          <folding>
+            <element signature="e#2560#2575#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1371,6 +1413,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.332696" vertical-offset="838" max-vertical-offset="2002">
           <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
+          <folding>
+            <element signature="e#2170#2184#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1378,24 +1423,123 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.68458784" vertical-offset="1114" max-vertical-offset="1672">
           <caret line="85" column="0" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarmType.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.493578" vertical-offset="39" max-vertical-offset="1122">
+          <caret line="18" column="28" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33333334" vertical-offset="298" max-vertical-offset="1738">
+          <caret line="51" column="15" selection-start-line="51" selection-start-column="15" selection-end-line="51" selection-end-column="15" />
+          <folding>
+            <element signature="method#getPgInPgStatusByPerson#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="method#getInPgNumByName#0;class#PgInPgStatusManager#0" expanded="false" />
+            <element signature="e#2483#2498#0" expanded="true" />
+            <element signature="e#3204#3219#0" expanded="true" />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1523239716735" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1259" max-vertical-offset="1804">
+          <caret line="131" column="97" selection-start-line="131" selection-start-column="97" selection-end-line="131" selection-end-column="97" />
+          <folding>
+            <element signature="method#getAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#clearAlarmList#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#addAlarm#0;class#PgAlarmRs#0" expanded="false" />
+            <element signature="method#getAlarmByTypeOrTime#0;class#PgAlarmRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1804">
+          <caret line="111" column="69" selection-start-line="111" selection-start-column="69" selection-end-line="111" selection-end-column="69" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTypeManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1276">
+          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="814">
+          <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6863799" vertical-offset="827" max-vertical-offset="1474">
-          <caret line="130" column="9" selection-start-line="130" selection-start-column="9" selection-end-line="130" selection-end-column="9" />
+        <state vertical-scroll-proportion="0.23302752" vertical-offset="2711" max-vertical-offset="3410">
+          <caret line="252" column="23" selection-start-line="252" selection-start-column="11" selection-end-line="252" selection-end-column="23" />
           <folding>
+            <element signature="imports" expanded="true" />
             <element signature="method#setPgInPgPersonManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#setPgInPgStatusManager#0;class#PgOverViewRs#0" expanded="false" />
             <element signature="method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#1689#1705#0" expanded="true" />
             <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2347#2363#0" expanded="true" />
             <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3000#3016#0" expanded="true" />
+            <element signature="e#3107#3122#0" expanded="true" />
             <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3800#3816#0" expanded="true" />
+            <element signature="e#3907#3922#0" expanded="true" />
+            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#4507#4523#0" expanded="true" />
+            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5164#5180#0" expanded="true" />
+            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5847#5863#0" expanded="true" />
+            <element signature="e#6539#6555#0" expanded="true" />
+            <element signature="e#6644#6658#0" expanded="true" />
+            <element signature="e#7372#7388#0" expanded="true" />
+            <element signature="e#7470#7482#0" expanded="true" />
           </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.76344085" vertical-offset="1840" max-vertical-offset="2486">
+          <caret line="165" column="29" selection-start-line="165" selection-start-column="15" selection-end-line="165" selection-end-column="29" />
+          <folding>
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4662#4676#0" expanded="true" />
+            <element signature="e#6035#6047#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.18899083" vertical-offset="271" max-vertical-offset="1672">
+          <caret line="23" column="35" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
index dd81cfb..85789a0 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -4,7 +4,10 @@
 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.domain.PgAlarmType;
 import com.casic.PgInterface.devTable.dto.PgAlarmDto;
+import com.casic.PgInterface.devTable.dto.PgAlarmTjDto;
+import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
@@ -13,6 +16,7 @@
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -43,8 +47,7 @@
         return pgAlarmDtoList;
     }
 
-    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime)
-    {
+    public List<PgAlarmDto> getAlarmByTypeAndTime(String alarmType,String startTime,String endTime){
         try {
             Criteria criteria = createCriteria(PgAlarm.class);
             if (StringUtils.isNotBlank(alarmType)) {
@@ -79,4 +82,88 @@
         }
     }
 
+    public int getAlarmNum(String isDevFault) {
+        String hql = "select count(*) from PgAlarm pgAlarm ";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.valueOf(object.toString());
+    }
+
+    public int getMonthAlarmNum(String isDevFault) {
+
+        String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'yyyy-mm')" +
+                " = to_char(" + new Date() + ",'yyyy-mm')";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.parseInt(String.valueOf(object));
+    }
+
+    public int getWeekAlarmNum(String isDevFault) {
+        String hql = "select count(*) from PgAlarm pgAlarm where to_char(pgAlarm.alarmDate, 'iw')" +
+                " = to_char(" + new Date() + ",'iw')";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        Object object = this.getSession().createQuery(hql).uniqueResult();
+        return Integer.parseInt(String.valueOf(object));
+    }
+
+    public List<PgAlarmTjDto> getDayAlarmStatistic(String isDevFault) {
+
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+
+        String hql = "select count(*), to_char(pgAlarm.alarmDate, 'yyyy-mm-dd') from PgAlarm pgAlarm";
+
+        if (isDevFault.equals("true"))
+            hql += " where pgAlarm.alarmTypeId.alarmType = '设备运行状态报警'";
+        else
+            hql += " where pgAlarm.alarmTypeId.alarmType != '设备运行状态报警'";
+
+        hql += " group by to_char(pgAlarm.alarmDate, 'yyyy-mm-dd')";
+
+        List<Object[]> objects = this.getSession().createQuery(hql).list();
+        for (int i = 0; i < objects.size(); i++) {
+            PgAlarmTjDto pgAlarmTjDto = new PgAlarmTjDto();
+            pgAlarmTjDto.setAlarmNum(objects.get(i)[0].toString());
+            pgAlarmTjDto.setAlarmDate(objects.get(i)[1].toString());
+            pgAlarmTjDtoList.add(pgAlarmTjDto);
+        }
+        return pgAlarmTjDtoList;
+    }
+
+    public List<PgAlarmDto> getAlarmList(String isDevFault) {
+
+        PgAlarmType pgAlarmType=pgAlarmTypeManager.getAlarmTypeByAlarmType("设备运行状态报警");
+
+        Criteria criteria=createCriteria(PgAlarm.class);
+        criteria.add(Restrictions.eq("active",1));
+
+        if(isDevFault.equals("true"))
+            criteria.add(Restrictions.eq("alarmTypeId",pgAlarmType));
+        else
+            criteria.add(Restrictions.ne("alarmTypeId", pgAlarmType));
+
+        List<PgAlarm> pgAlarmList = criteria.list();
+        List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
+        for(PgAlarm pgAlarm : pgAlarmList)
+        {
+            pgAlarmDtoList.add(new PgAlarmDto(pgAlarm));
+        }
+
+        return pgAlarmDtoList;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index ef53dc0..1fbe313 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -1,5 +1,7 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.devTable.dto.PgAlarmDto;
+import com.casic.PgInterface.devTable.dto.PgAlarmTjDto;
 import com.casic.PgInterface.devTable.manager.PgAlarmManager;
 import com.casic.PgInterface.patroler.dto.PgInPgInfoDto;
 import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
@@ -7,6 +9,7 @@
 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;
@@ -51,23 +54,21 @@
     @POST
     @Path("getMonthInPgPersonNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object,String> getMonthInPgPersonNum() throws Exception
-    {
-        Map<Object,String> resultMap=new HashMap<Object, String>();
-        String result="";
-        String msg="";
-        int inNum=0;
+    private Map<Object, String> getMonthInPgPersonNum() throws Exception {
+        Map<Object, String> resultMap = new HashMap<Object, String>();
+        String msg = "";
+        int inNum = 0;
 
-        try{
-            inNum=pgInPgStatusManager.getMonthInPgPersonNum();
-            msg="入廊人员次数获取成功";
-        }catch(Exception e){
+        try {
+            inNum = pgInPgStatusManager.getMonthInPgPersonNum();
+            msg = "入廊人员次数获取成功";
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="入廊人员次数获取失败";
+            msg = "入廊人员次数获取失败";
         }
 
         resultMap.put("msg", msg);
-        resultMap.put("result",String.valueOf(inNum));
+        resultMap.put("result", String.valueOf(inNum));
 
         return resultMap;
     }
@@ -78,9 +79,8 @@
     @POST
     @Path("getWeekInPgPersonNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object,String> getWeekInPgPersonNum() throws Exception {
+    private Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
-        String result = "";
         String msg = "";
         int inNum = 0;
         try {
@@ -103,25 +103,24 @@
     @POST
     @Path("getDayInPgStatistic")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<String,Object> getDayInPgStatistic() throws Exception{
-        Map<String,Object> resultMap=new HashMap<String,Object>();
+    private Map<String, Object> getDayInPgStatistic() throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
 
-        List<PgInPgInfoDto> pgInPgInfoDtoList=new ArrayList<PgInPgInfoDto>();
-        try{
-            pgInPgInfoDtoList=pgInPgStatusManager.getPgInPersonListByDay();
-            if(pgInPgInfoDtoList==null)
-                msg="信息获取失败";
+        List<PgInPgInfoDto> pgInPgInfoDtoList = new ArrayList<PgInPgInfoDto>();
+        try {
+            pgInPgInfoDtoList = pgInPgStatusManager.getPgInPersonListByDay();
+            if (pgInPgInfoDtoList == null)
+                msg = "信息获取失败";
             else
-                msg="信息获取成功";
-        }catch(Exception e)
-        {
+                msg = "信息获取成功";
+        } catch (Exception e) {
             e.printStackTrace();
-            msg="信息获取失败";
+            msg = "信息获取失败";
         }
 
-        resultMap.put("msg",msg);
-        resultMap.put("result",pgInPgInfoDtoList);
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgInPgInfoDtoList);
         return resultMap;
     }
 
@@ -131,7 +130,7 @@
     @POST
     @Path("getTodayInPgInfo")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String,Object> getTodayInPgInfo() throws Exception {
+    public Map<String, Object> getTodayInPgInfo() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
 
@@ -149,5 +148,126 @@
         return resultMap;
     }
 
+    //报警
+    @POST
+    @Path("getAlarmNum")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> getAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        int num = 0;
 
+        try {
+            num = pgAlarmManager.getAlarmNum(isDevFault);
+            msg = "报警数量获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "报警数量统计失败";
+        }
+        resultMap.put("msg", msg);
+        resultMap.put("result", num);
+
+        return resultMap;
+    }
+
+    /**
+     * 获取本月报警数
+     */
+    @POST
+    @Path("getMonthAlarmNum")
+    @Produces(MediaType.APPLICATION_JSON)
+    private Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
+        Map<Object, String> resultMap = new HashMap<Object, String>();
+        String msg = "";
+        int inNum = 0;
+
+        try {
+            inNum = pgAlarmManager.getMonthAlarmNum(isDevFault);
+            msg = "报警次数获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "报警次数获取失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", String.valueOf(inNum));
+
+        return resultMap;
+    }
+
+    /**
+     * 获取本周报警数
+     */
+    @POST
+    @Path("getWeekAlarmNum")
+    @Produces(MediaType.APPLICATION_JSON)
+    private Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
+        Map<Object, String> resultMap = new HashMap<Object, String>();
+        String msg = "";
+        int inNum = 0;
+        try {
+            inNum = pgAlarmManager.getWeekAlarmNum(isDevFault);
+            msg = "报警次数获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "报警次数获取失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", String.valueOf(inNum));
+
+        return resultMap;
+    }
+
+    /*
+     * 按照天统计报警次数
+     */
+    @POST
+    @Path("getDayAlarmStatistic")
+    @Produces(MediaType.APPLICATION_JSON)
+    private Map<String, Object> getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception {
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+
+        List<PgAlarmTjDto> pgAlarmTjDtoList = new ArrayList<PgAlarmTjDto>();
+        try {
+            pgAlarmTjDtoList = pgAlarmManager.getDayAlarmStatistic(isDevFault);
+            if (pgAlarmTjDtoList == null)
+                msg = "信息获取失败";
+            else
+                msg = "信息获取成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            msg = "信息获取失败";
+        }
+
+        resultMap.put("msg", msg);
+        resultMap.put("result", pgAlarmTjDtoList);
+        return resultMap;
+    }
+
+    /*
+     * 报警列表和设备故障列表
+     */
+    @POST
+    @Path("getAlarmList")
+    @Produces(MediaType.APPLICATION_JSON)
+    private Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg = "";
+        List<PgAlarmDto> pgAlarmDtoList=new ArrayList<PgAlarmDto>();
+        try{
+            pgAlarmDtoList=pgAlarmManager.getAlarmList(isDevFault);
+            msg="信息获取成功";
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+            msg="信息获取失败";
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgAlarmDtoList);
+
+        return resultMap;
+    }
 }
\ No newline at end of file