diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d49dc00..026f98e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -46,7 +46,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
@@ -96,6 +95,7 @@
         <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/construction/dto/PgConstructionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
@@ -338,7 +338,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -372,7 +372,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -406,7 +406,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -857,7 +857,7 @@
       <workItem from="1523148745408" duration="8835000" />
       <workItem from="1523157765522" duration="919000" />
       <workItem from="1523158719185" duration="18552000" />
-      <workItem from="1523237655585" duration="6708000" />
+      <workItem from="1523237655585" duration="8341000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -983,11 +983,15 @@
       <created>1523237727191</created>
       <updated>1523237727191</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="完成报警综览">
+      <created>1523244710693</created>
+      <updated>1523244710693</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="482922000" />
+    <option name="totallyTimeSpent" value="484555000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -1064,7 +1068,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="first commit" />
     <MESSAGE value="参数中idString转long" />
     <MESSAGE value="去掉管廊表中的code字段" />
     <MESSAGE value="去掉所有表的code字段用name表达唯一属性，增加唯一性检查功能" />
@@ -1089,18 +1092,11 @@
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
     <MESSAGE value="修改年月日统计问题" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改年月日统计问题" />
+    <MESSAGE value="完成报警综览" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成报警综览" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java</url>
-          <line>87</line>
-          <properties />
-          <option name="timeStamp" value="71" />
-        </line-breakpoint>
-      </breakpoints>
       <option name="time" value="105" />
     </breakpoint-manager>
   </component>
@@ -1109,108 +1105,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="35" column="27" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="489" max-vertical-offset="1100">
-          <caret line="84" column="9" selection-start-line="84" selection-start-column="9" selection-end-line="84" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.3154122" vertical-offset="528" max-vertical-offset="3190">
-          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-          <folding>
-            <element signature="method#getUserList#0;class#PgUserRs#0" expanded="false" />
-            <element signature="method#deleteUser#0;class#PgUserRs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="0" max-vertical-offset="748">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3229358" vertical-offset="0" max-vertical-offset="4158">
-          <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="924" max-vertical-offset="3674">
-          <caret line="72" column="13" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="586" max-vertical-offset="1144">
-          <caret line="62" column="32" selection-start-line="60" selection-start-column="3" selection-end-line="62" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="4778" max-vertical-offset="13244">
-          <caret line="261" column="0" selection-start-line="261" selection-start-column="0" selection-end-line="261" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="1804">
-          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="34" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="34" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </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">
-          <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53394496" vertical-offset="61" max-vertical-offset="1364">
-          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="2068">
-          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.744954" vertical-offset="0" max-vertical-offset="2332">
@@ -1282,20 +1176,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41218638" vertical-offset="210" max-vertical-offset="2332">
-          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.2437276" vertical-offset="1464" max-vertical-offset="2332">
-          <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28107074" vertical-offset="161" max-vertical-offset="1034">
@@ -1357,14 +1237,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.64220184" vertical-offset="1586" max-vertical-offset="2288">
@@ -1373,14 +1245,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5614679" vertical-offset="1674" max-vertical-offset="2332">
@@ -1389,16 +1253,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1032" max-vertical-offset="2156">
@@ -1414,19 +1268,11 @@
         <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" />
+            <element signature="e#2170#2184#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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">
@@ -1450,19 +1296,6 @@
         </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">
@@ -1487,42 +1320,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+    <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.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 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>
     <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" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1840" max-vertical-offset="2486">
+          <caret line="164" column="0" selection-start-line="164" selection-start-column="0" selection-end-line="164" selection-end-column="0" />
           <folding>
             <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
             <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
@@ -1532,10 +1341,212 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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" />
+        <state vertical-scroll-proportion="0.53394496" vertical-offset="61" max-vertical-offset="1364">
+          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60573477" vertical-offset="1224" max-vertical-offset="2046">
+          <caret line="118" column="35" selection-start-line="118" selection-start-column="35" selection-end-line="118" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.4623853" vertical-offset="1325" max-vertical-offset="2068">
+          <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3490" max-vertical-offset="4048">
+          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2632" max-vertical-offset="3190">
+          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+          <folding>
+            <element signature="method#getUserList#0;class#PgUserRs#0" expanded="false" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1809" max-vertical-offset="2354">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="190" max-vertical-offset="2332">
+          <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="12" max-vertical-offset="2332">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.1648746" vertical-offset="1406" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2117" max-vertical-offset="2662">
+          <caret line="248" column="6" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" />
+          <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#1688#1704#0" expanded="true" />
+            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2345#2361#0" expanded="true" />
+            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2997#3013#0" expanded="true" />
+            <element signature="e#3104#3119#0" expanded="true" />
+            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3797#3813#0" expanded="true" />
+            <element signature="e#3904#3919#0" expanded="true" />
+            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#4504#4520#0" expanded="true" />
+            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5160#5176#0" expanded="true" />
+            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5842#5858#0" expanded="true" />
+            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#6533#6549#0" expanded="true" />
+            <element signature="e#6638#6652#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#7365#7381#0" expanded="true" />
+            <element signature="e#7463#7475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="2332">
+          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3644" 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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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 />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1488" max-vertical-offset="2046">
+          <caret line="32" column="53" selection-start-line="32" selection-start-column="53" selection-end-line="32" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="6702" max-vertical-offset="7260">
+          <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2918" max-vertical-offset="3454">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3138" max-vertical-offset="3674">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <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="1281" max-vertical-offset="1804">
+          <caret line="173" column="31" selection-start-line="173" selection-start-column="31" selection-end-line="173" selection-end-column="31" />
+          <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/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.4157705" vertical-offset="2148" max-vertical-offset="2706">
+          <caret line="32" column="46" selection-start-line="32" selection-start-column="46" selection-end-line="32" selection-end-column="46" />
           <folding />
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d49dc00..026f98e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -46,7 +46,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" />
@@ -96,6 +95,7 @@
         <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/construction/dto/PgConstructionDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
       </list>
     </option>
@@ -338,7 +338,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -372,7 +372,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -406,7 +406,7 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
+              <option name="myItemId" value="construction" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -857,7 +857,7 @@
       <workItem from="1523148745408" duration="8835000" />
       <workItem from="1523157765522" duration="919000" />
       <workItem from="1523158719185" duration="18552000" />
-      <workItem from="1523237655585" duration="6708000" />
+      <workItem from="1523237655585" duration="8341000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -983,11 +983,15 @@
       <created>1523237727191</created>
       <updated>1523237727191</updated>
     </task>
-    <option name="localTasksCounter" value="32" />
+    <task id="LOCAL-00032" summary="完成报警综览">
+      <created>1523244710693</created>
+      <updated>1523244710693</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="482922000" />
+    <option name="totallyTimeSpent" value="484555000" />
   </component>
   <component name="TodoView" selected-index="2">
     <todo-panel id="selected-file">
@@ -1064,7 +1068,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="first commit" />
     <MESSAGE value="参数中idString转long" />
     <MESSAGE value="去掉管廊表中的code字段" />
     <MESSAGE value="去掉所有表的code字段用name表达唯一属性，增加唯一性检查功能" />
@@ -1089,18 +1092,11 @@
     <MESSAGE value="增加统计功能" />
     <MESSAGE value="修改标注" />
     <MESSAGE value="修改年月日统计问题" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改年月日统计问题" />
+    <MESSAGE value="完成报警综览" />
+    <option name="LAST_COMMIT_MESSAGE" value="完成报警综览" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java</url>
-          <line>87</line>
-          <properties />
-          <option name="timeStamp" value="71" />
-        </line-breakpoint>
-      </breakpoints>
       <option name="time" value="105" />
     </breakpoint-manager>
   </component>
@@ -1109,108 +1105,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <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">
-          <caret line="35" column="27" selection-start-line="35" selection-start-column="27" selection-end-line="35" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="489" max-vertical-offset="1100">
-          <caret line="84" column="9" selection-start-line="84" selection-start-column="9" selection-end-line="84" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.3154122" vertical-offset="528" max-vertical-offset="3190">
-          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
-          <folding>
-            <element signature="method#getUserList#0;class#PgUserRs#0" expanded="false" />
-            <element signature="method#deleteUser#0;class#PgUserRs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="0" max-vertical-offset="748">
-          <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3229358" vertical-offset="0" max-vertical-offset="4158">
-          <caret line="26" column="17" selection-start-line="26" selection-start-column="17" selection-end-line="26" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="924" max-vertical-offset="3674">
-          <caret line="72" column="13" selection-start-line="72" selection-start-column="13" selection-end-line="72" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgLog.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="586" max-vertical-offset="1144">
-          <caret line="62" column="32" selection-start-line="60" selection-start-column="3" selection-end-line="62" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-tx/4.0.6.RELEASE/spring-tx-4.0.6.RELEASE-sources.jar!/org/springframework/transaction/interceptor/TransactionAspectSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="4778" max-vertical-offset="13244">
-          <caret line="261" column="0" selection-start-line="261" selection-start-column="0" selection-end-line="261" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="58" max-vertical-offset="1804">
-          <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="34" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="34" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-        </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">
-          <caret line="17" column="58" selection-start-line="17" selection-start-column="58" selection-end-line="17" selection-end-column="58" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53394496" vertical-offset="61" max-vertical-offset="1364">
-          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="2068">
-          <caret line="18" column="20" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCsDocumentRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.744954" vertical-offset="0" max-vertical-offset="2332">
@@ -1282,20 +1176,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.41218638" vertical-offset="210" max-vertical-offset="2332">
-          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.2437276" vertical-offset="1464" max-vertical-offset="2332">
-          <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.28107074" vertical-offset="161" max-vertical-offset="1034">
@@ -1357,14 +1237,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgMaintainManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.64220184" vertical-offset="1586" max-vertical-offset="2288">
@@ -1373,14 +1245,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgPatrolManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5614679" vertical-offset="1674" max-vertical-offset="2332">
@@ -1389,16 +1253,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1032" max-vertical-offset="2156">
@@ -1414,19 +1268,11 @@
         <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" />
+            <element signature="e#2170#2184#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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">
@@ -1450,19 +1296,6 @@
         </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">
@@ -1487,42 +1320,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+    <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.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 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>
     <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" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1840" max-vertical-offset="2486">
+          <caret line="164" column="0" selection-start-line="164" selection-start-column="0" selection-end-line="164" selection-end-column="0" />
           <folding>
             <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
             <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
@@ -1532,10 +1341,212 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgCsDocument.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.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" />
+        <state vertical-scroll-proportion="0.53394496" vertical-offset="61" max-vertical-offset="1364">
+          <caret line="18" column="27" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60573477" vertical-offset="1224" max-vertical-offset="2046">
+          <caret line="118" column="35" selection-start-line="118" selection-start-column="35" selection-end-line="118" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-1.4623853" vertical-offset="1325" max-vertical-offset="2068">
+          <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3490" max-vertical-offset="4048">
+          <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2632" max-vertical-offset="3190">
+          <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
+          <folding>
+            <element signature="method#getUserList#0;class#PgUserRs#0" expanded="false" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1809" max-vertical-offset="2354">
+          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/pgStatisticRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="190" max-vertical-offset="2332">
+          <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="12" max-vertical-offset="2332">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-2.1648746" vertical-offset="1406" max-vertical-offset="4576">
+          <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2117" max-vertical-offset="2662">
+          <caret line="248" column="6" selection-start-line="248" selection-start-column="6" selection-end-line="248" selection-end-column="6" />
+          <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#1688#1704#0" expanded="true" />
+            <element signature="method#getWeekInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2345#2361#0" expanded="true" />
+            <element signature="method#getDayInPgStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2997#3013#0" expanded="true" />
+            <element signature="e#3104#3119#0" expanded="true" />
+            <element signature="method#getTodayInPgInfo#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#3797#3813#0" expanded="true" />
+            <element signature="e#3904#3919#0" expanded="true" />
+            <element signature="method#getAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#4504#4520#0" expanded="true" />
+            <element signature="method#getMonthAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5160#5176#0" expanded="true" />
+            <element signature="method#getWeekAlarmNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#5842#5858#0" expanded="true" />
+            <element signature="method#getDayAlarmStatistic#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#6533#6549#0" expanded="true" />
+            <element signature="e#6638#6652#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#7365#7381#0" expanded="true" />
+            <element signature="e#7463#7475#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="2332">
+          <caret line="38" column="4" selection-start-line="38" selection-start-column="4" selection-end-line="38" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3644" 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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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 />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="1488" max-vertical-offset="2046">
+          <caret line="32" column="53" selection-start-line="32" selection-start-column="53" selection-end-line="32" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="6702" max-vertical-offset="7260">
+          <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAuthorityRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2918" max-vertical-offset="3454">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="3138" max-vertical-offset="3674">
+          <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" 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/rs/PgAlarmRuleRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="2610" max-vertical-offset="3146">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <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="1281" max-vertical-offset="1804">
+          <caret line="173" column="31" selection-start-line="173" selection-start-column="31" selection-end-line="173" selection-end-column="31" />
+          <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/rs/PgAlarmLinkRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-3.4157705" vertical-offset="2148" max-vertical-offset="2706">
+          <caret line="32" column="46" selection-start-line="32" selection-start-column="46" selection-end-line="32" selection-end-column="46" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
index 1fbe313..8bca0fb 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java
@@ -54,7 +54,7 @@
     @POST
     @Path("getMonthInPgPersonNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object, String> getMonthInPgPersonNum() throws Exception {
+    public Map<Object, String> getMonthInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
         int inNum = 0;
@@ -79,7 +79,7 @@
     @POST
     @Path("getWeekInPgPersonNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object, String> getWeekInPgPersonNum() throws Exception {
+    public Map<Object, String> getWeekInPgPersonNum() throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
         int inNum = 0;
@@ -103,7 +103,7 @@
     @POST
     @Path("getDayInPgStatistic")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<String, Object> getDayInPgStatistic() throws Exception {
+    public Map<String, Object> getDayInPgStatistic() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
 
@@ -176,7 +176,7 @@
     @POST
     @Path("getMonthAlarmNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
+    public Map<Object, String> getMonthAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
         int inNum = 0;
@@ -201,7 +201,7 @@
     @POST
     @Path("getWeekAlarmNum")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
+    public Map<Object, String> getWeekAlarmNum(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<Object, String> resultMap = new HashMap<Object, String>();
         String msg = "";
         int inNum = 0;
@@ -225,7 +225,7 @@
     @POST
     @Path("getDayAlarmStatistic")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<String, Object> getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception {
+    public Map<String, Object> getDayAlarmStatistic(@FormParam("isDevFault") String isDevFault) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
 
@@ -252,7 +252,7 @@
     @POST
     @Path("getAlarmList")
     @Produces(MediaType.APPLICATION_JSON)
-    private Map<String, Object> getAlarmList(@FormParam("isDevFault") String isDevFault) throws Exception{
+    public 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>();
@@ -270,4 +270,6 @@
 
         return resultMap;
     }
+
+
 }
\ No newline at end of file