diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
new file mode 100644
index 0000000..8f049c8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -0,0 +1,213 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
+import com.casic.PgInterface.devTable.manager.PgPartitionManager;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgRoad")
+public class PgRoadRs {
+    private static Logger logger = LoggerFactory.getLogger(PgRoad.class);
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @Resource
+    private PgPartitionManager pgPartitionManager;
+
+    /**
+     * 获取道路信息
+     */
+    @POST
+    @Path("getRoadList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getRoadList(){
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
+        try{
+            pgRoadDtoList = pgRoadManager.getAllRoad();
+            if (pgRoadDtoList.size() == 0)
+                msg = "没有道路信息";
+            else
+                msg = "道路信息获取成功";
+        }
+        catch(Exception e){
+            msg="道路信息获取失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgRoadDtoList);
+
+        return resultMap;
+    }
+
+    /**
+     * 新增道路信息
+     */
+    @POST
+    @Path("addRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addRoad(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        try{
+            PgRoad pgRoad=new PgRoad();
+            pgRoad.setRoadName(roadName);
+            pgRoad.setActive(1);
+
+            pgRoadManager.save(pgRoad);
+
+            msg="新增道路成功";
+            result="true";
+        }
+        catch (Exception e){
+            msg="新增道路失败";
+            result="true";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 编辑道路信息
+     */
+    @POST
+    @Path("editRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> editRoad(@FormParam("id") String id,
+                                       @FormParam("roadName") String roadName)throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+
+        try {
+            PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
+
+            if(pgRoad==null)
+            {
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setRoadName(roadName);
+                pgRoad.setActive(1);
+
+                pgRoadManager.save(pgRoad);
+                msg="道路信息保存成功";
+                result="true";
+            }
+        }
+        catch(Exception e){
+            msg="道路信息编辑失败";
+            result="false";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 删除道路阈值
+     */
+    @POST
+    @Path("deleteRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteRoad(@FormParam("id") String id) throws Exception {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+        PgRoad pgRoad=null;
+
+        try{
+            pgRoad=pgRoadManager.get(Long.valueOf(id));
+            if(pgRoad==null){
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setActive(0);
+                pgRoadManager.save(pgRoad);
+                msg="道路删除成功";
+                result="true";
+            }
+        }
+        catch (Exception e){
+            msg="道路删除出错";
+            result="false";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据道路获取分区信息
+     */
+    @POST
+    @Path("getParNameByRoadName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getParNameByRoadName(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        List<PgPartitionDto> pgPartitionDtoList=null;
+        try{
+            PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
+            if(pgRoad==null)
+                msg="不存在道路信息";
+            else
+            {
+                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
+                    msg="该道路没有分区信息";
+                else
+                    msg="分区信息获取成功";
+            }
+        }
+        catch (Exception e)
+        {
+            msg="分区信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPartitionDtoList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
new file mode 100644
index 0000000..8f049c8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -0,0 +1,213 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
+import com.casic.PgInterface.devTable.manager.PgPartitionManager;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgRoad")
+public class PgRoadRs {
+    private static Logger logger = LoggerFactory.getLogger(PgRoad.class);
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @Resource
+    private PgPartitionManager pgPartitionManager;
+
+    /**
+     * 获取道路信息
+     */
+    @POST
+    @Path("getRoadList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getRoadList(){
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
+        try{
+            pgRoadDtoList = pgRoadManager.getAllRoad();
+            if (pgRoadDtoList.size() == 0)
+                msg = "没有道路信息";
+            else
+                msg = "道路信息获取成功";
+        }
+        catch(Exception e){
+            msg="道路信息获取失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgRoadDtoList);
+
+        return resultMap;
+    }
+
+    /**
+     * 新增道路信息
+     */
+    @POST
+    @Path("addRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addRoad(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        try{
+            PgRoad pgRoad=new PgRoad();
+            pgRoad.setRoadName(roadName);
+            pgRoad.setActive(1);
+
+            pgRoadManager.save(pgRoad);
+
+            msg="新增道路成功";
+            result="true";
+        }
+        catch (Exception e){
+            msg="新增道路失败";
+            result="true";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 编辑道路信息
+     */
+    @POST
+    @Path("editRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> editRoad(@FormParam("id") String id,
+                                       @FormParam("roadName") String roadName)throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+
+        try {
+            PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
+
+            if(pgRoad==null)
+            {
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setRoadName(roadName);
+                pgRoad.setActive(1);
+
+                pgRoadManager.save(pgRoad);
+                msg="道路信息保存成功";
+                result="true";
+            }
+        }
+        catch(Exception e){
+            msg="道路信息编辑失败";
+            result="false";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 删除道路阈值
+     */
+    @POST
+    @Path("deleteRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteRoad(@FormParam("id") String id) throws Exception {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+        PgRoad pgRoad=null;
+
+        try{
+            pgRoad=pgRoadManager.get(Long.valueOf(id));
+            if(pgRoad==null){
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setActive(0);
+                pgRoadManager.save(pgRoad);
+                msg="道路删除成功";
+                result="true";
+            }
+        }
+        catch (Exception e){
+            msg="道路删除出错";
+            result="false";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据道路获取分区信息
+     */
+    @POST
+    @Path("getParNameByRoadName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getParNameByRoadName(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        List<PgPartitionDto> pgPartitionDtoList=null;
+        try{
+            PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
+            if(pgRoad==null)
+                msg="不存在道路信息";
+            else
+            {
+                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
+                    msg="该道路没有分区信息";
+                else
+                    msg="分区信息获取成功";
+            }
+        }
+        catch (Exception e)
+        {
+            msg="分区信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPartitionDtoList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 612597e..6d310bd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -1,6 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.patroler.domain.PgRole;
 import com.casic.PgInterface.patroler.domain.PgUser;
 import com.casic.PgInterface.patroler.dto.PgUserDto;
 import com.casic.PgInterface.patroler.manager.PgRoleManager;
@@ -78,14 +77,14 @@
                                            @FormParam("password") String password,
                                            @FormParam("department") String department,
                                            @FormParam("post") String post,
-                                           @FormParam("phoneNumber") String phoneNumber,
-                                           @FormParam("role") String role)throws Exception {
+                                           @FormParam("phoneNumber") String phoneNumber
+    )throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
 
         try {
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             if (pgUserManager.userNameIsExits(userName)) {
                 result = "false";
@@ -99,7 +98,7 @@
                 pgUser.setDepartment(department);
                 pgUser.setPost(post);
                 pgUser.setPhoneNumber(phoneNumber);
-                pgUser.setPgRoleId(pgRole);
+//                pgUser.setPgRoleId(pgRole);
                 pgUser.setActive(1);
                 logger.info("成功保存");
 
@@ -129,20 +128,15 @@
                                              @FormParam("password") String password,
                                              @FormParam("department") String department,
                                              @FormParam("post") String post,
-                                             @FormParam("phoneNumber") String phoneNumber,
-                                             @FormParam("role") String role) throws Exception {
+                                             @FormParam("phoneNumber") String phoneNumber
+    ) throws Exception {
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
         try {
-            /*
-            if (pgUserManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "用户名已经存在!";
-            } else {
-            */
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             PgUser pgUser = pgUserManager.get(Long.valueOf(id));
             pgUser.setUserName(userName);
@@ -150,7 +144,7 @@
             pgUser.setDepartment(department);
             pgUser.setPost(post);
             pgUser.setPhoneNumber(phoneNumber);
-            pgUser.setPgRoleId(pgRole);
+//            pgUser.setPgRoleId(pgRole);
             pgUserManager.save(pgUser);
             result = "true";
             msg = "编辑成功";
@@ -201,5 +195,37 @@
         return resultMap;
     }
 
+    /**
+     * 登录
+     */
+    @POST
+    @Path("signIn")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> signIn(@FormParam("userName") String userName,
+                                     @FormParam("passWord") String passWord) {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
 
+        try{
+            if(pgUserManager.signIn(userName,passWord)==true)
+            {
+                msg="登录成功";
+                result="true";
+            }
+            else {
+                msg="登录失败";
+                result="false";
+            }
+        }
+        catch(Exception e){
+            msg="登陆失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
new file mode 100644
index 0000000..8f049c8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -0,0 +1,213 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
+import com.casic.PgInterface.devTable.manager.PgPartitionManager;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgRoad")
+public class PgRoadRs {
+    private static Logger logger = LoggerFactory.getLogger(PgRoad.class);
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @Resource
+    private PgPartitionManager pgPartitionManager;
+
+    /**
+     * 获取道路信息
+     */
+    @POST
+    @Path("getRoadList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getRoadList(){
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
+        try{
+            pgRoadDtoList = pgRoadManager.getAllRoad();
+            if (pgRoadDtoList.size() == 0)
+                msg = "没有道路信息";
+            else
+                msg = "道路信息获取成功";
+        }
+        catch(Exception e){
+            msg="道路信息获取失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgRoadDtoList);
+
+        return resultMap;
+    }
+
+    /**
+     * 新增道路信息
+     */
+    @POST
+    @Path("addRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addRoad(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        try{
+            PgRoad pgRoad=new PgRoad();
+            pgRoad.setRoadName(roadName);
+            pgRoad.setActive(1);
+
+            pgRoadManager.save(pgRoad);
+
+            msg="新增道路成功";
+            result="true";
+        }
+        catch (Exception e){
+            msg="新增道路失败";
+            result="true";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 编辑道路信息
+     */
+    @POST
+    @Path("editRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> editRoad(@FormParam("id") String id,
+                                       @FormParam("roadName") String roadName)throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+
+        try {
+            PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
+
+            if(pgRoad==null)
+            {
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setRoadName(roadName);
+                pgRoad.setActive(1);
+
+                pgRoadManager.save(pgRoad);
+                msg="道路信息保存成功";
+                result="true";
+            }
+        }
+        catch(Exception e){
+            msg="道路信息编辑失败";
+            result="false";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 删除道路阈值
+     */
+    @POST
+    @Path("deleteRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteRoad(@FormParam("id") String id) throws Exception {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+        PgRoad pgRoad=null;
+
+        try{
+            pgRoad=pgRoadManager.get(Long.valueOf(id));
+            if(pgRoad==null){
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setActive(0);
+                pgRoadManager.save(pgRoad);
+                msg="道路删除成功";
+                result="true";
+            }
+        }
+        catch (Exception e){
+            msg="道路删除出错";
+            result="false";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据道路获取分区信息
+     */
+    @POST
+    @Path("getParNameByRoadName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getParNameByRoadName(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        List<PgPartitionDto> pgPartitionDtoList=null;
+        try{
+            PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
+            if(pgRoad==null)
+                msg="不存在道路信息";
+            else
+            {
+                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
+                    msg="该道路没有分区信息";
+                else
+                    msg="分区信息获取成功";
+            }
+        }
+        catch (Exception e)
+        {
+            msg="分区信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPartitionDtoList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 612597e..6d310bd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -1,6 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.patroler.domain.PgRole;
 import com.casic.PgInterface.patroler.domain.PgUser;
 import com.casic.PgInterface.patroler.dto.PgUserDto;
 import com.casic.PgInterface.patroler.manager.PgRoleManager;
@@ -78,14 +77,14 @@
                                            @FormParam("password") String password,
                                            @FormParam("department") String department,
                                            @FormParam("post") String post,
-                                           @FormParam("phoneNumber") String phoneNumber,
-                                           @FormParam("role") String role)throws Exception {
+                                           @FormParam("phoneNumber") String phoneNumber
+    )throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
 
         try {
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             if (pgUserManager.userNameIsExits(userName)) {
                 result = "false";
@@ -99,7 +98,7 @@
                 pgUser.setDepartment(department);
                 pgUser.setPost(post);
                 pgUser.setPhoneNumber(phoneNumber);
-                pgUser.setPgRoleId(pgRole);
+//                pgUser.setPgRoleId(pgRole);
                 pgUser.setActive(1);
                 logger.info("成功保存");
 
@@ -129,20 +128,15 @@
                                              @FormParam("password") String password,
                                              @FormParam("department") String department,
                                              @FormParam("post") String post,
-                                             @FormParam("phoneNumber") String phoneNumber,
-                                             @FormParam("role") String role) throws Exception {
+                                             @FormParam("phoneNumber") String phoneNumber
+    ) throws Exception {
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
         try {
-            /*
-            if (pgUserManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "用户名已经存在!";
-            } else {
-            */
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             PgUser pgUser = pgUserManager.get(Long.valueOf(id));
             pgUser.setUserName(userName);
@@ -150,7 +144,7 @@
             pgUser.setDepartment(department);
             pgUser.setPost(post);
             pgUser.setPhoneNumber(phoneNumber);
-            pgUser.setPgRoleId(pgRole);
+//            pgUser.setPgRoleId(pgRole);
             pgUserManager.save(pgUser);
             result = "true";
             msg = "编辑成功";
@@ -201,5 +195,37 @@
         return resultMap;
     }
 
+    /**
+     * 登录
+     */
+    @POST
+    @Path("signIn")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> signIn(@FormParam("userName") String userName,
+                                     @FormParam("passWord") String passWord) {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
 
+        try{
+            if(pgUserManager.signIn(userName,passWord)==true)
+            {
+                msg="登录成功";
+                result="true";
+            }
+            else {
+                msg="登录失败";
+                result="false";
+            }
+        }
+        catch(Exception e){
+            msg="登陆失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
 }
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
new file mode 100644
index 0000000..c307c0b
--- /dev/null
+++ b/~WRL2471.tmp
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
new file mode 100644
index 0000000..8f049c8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -0,0 +1,213 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
+import com.casic.PgInterface.devTable.manager.PgPartitionManager;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgRoad")
+public class PgRoadRs {
+    private static Logger logger = LoggerFactory.getLogger(PgRoad.class);
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @Resource
+    private PgPartitionManager pgPartitionManager;
+
+    /**
+     * 获取道路信息
+     */
+    @POST
+    @Path("getRoadList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getRoadList(){
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
+        try{
+            pgRoadDtoList = pgRoadManager.getAllRoad();
+            if (pgRoadDtoList.size() == 0)
+                msg = "没有道路信息";
+            else
+                msg = "道路信息获取成功";
+        }
+        catch(Exception e){
+            msg="道路信息获取失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgRoadDtoList);
+
+        return resultMap;
+    }
+
+    /**
+     * 新增道路信息
+     */
+    @POST
+    @Path("addRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addRoad(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        try{
+            PgRoad pgRoad=new PgRoad();
+            pgRoad.setRoadName(roadName);
+            pgRoad.setActive(1);
+
+            pgRoadManager.save(pgRoad);
+
+            msg="新增道路成功";
+            result="true";
+        }
+        catch (Exception e){
+            msg="新增道路失败";
+            result="true";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 编辑道路信息
+     */
+    @POST
+    @Path("editRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> editRoad(@FormParam("id") String id,
+                                       @FormParam("roadName") String roadName)throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+
+        try {
+            PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
+
+            if(pgRoad==null)
+            {
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setRoadName(roadName);
+                pgRoad.setActive(1);
+
+                pgRoadManager.save(pgRoad);
+                msg="道路信息保存成功";
+                result="true";
+            }
+        }
+        catch(Exception e){
+            msg="道路信息编辑失败";
+            result="false";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 删除道路阈值
+     */
+    @POST
+    @Path("deleteRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteRoad(@FormParam("id") String id) throws Exception {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+        PgRoad pgRoad=null;
+
+        try{
+            pgRoad=pgRoadManager.get(Long.valueOf(id));
+            if(pgRoad==null){
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setActive(0);
+                pgRoadManager.save(pgRoad);
+                msg="道路删除成功";
+                result="true";
+            }
+        }
+        catch (Exception e){
+            msg="道路删除出错";
+            result="false";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据道路获取分区信息
+     */
+    @POST
+    @Path("getParNameByRoadName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getParNameByRoadName(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        List<PgPartitionDto> pgPartitionDtoList=null;
+        try{
+            PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
+            if(pgRoad==null)
+                msg="不存在道路信息";
+            else
+            {
+                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
+                    msg="该道路没有分区信息";
+                else
+                    msg="分区信息获取成功";
+            }
+        }
+        catch (Exception e)
+        {
+            msg="分区信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPartitionDtoList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 612597e..6d310bd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -1,6 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.patroler.domain.PgRole;
 import com.casic.PgInterface.patroler.domain.PgUser;
 import com.casic.PgInterface.patroler.dto.PgUserDto;
 import com.casic.PgInterface.patroler.manager.PgRoleManager;
@@ -78,14 +77,14 @@
                                            @FormParam("password") String password,
                                            @FormParam("department") String department,
                                            @FormParam("post") String post,
-                                           @FormParam("phoneNumber") String phoneNumber,
-                                           @FormParam("role") String role)throws Exception {
+                                           @FormParam("phoneNumber") String phoneNumber
+    )throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
 
         try {
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             if (pgUserManager.userNameIsExits(userName)) {
                 result = "false";
@@ -99,7 +98,7 @@
                 pgUser.setDepartment(department);
                 pgUser.setPost(post);
                 pgUser.setPhoneNumber(phoneNumber);
-                pgUser.setPgRoleId(pgRole);
+//                pgUser.setPgRoleId(pgRole);
                 pgUser.setActive(1);
                 logger.info("成功保存");
 
@@ -129,20 +128,15 @@
                                              @FormParam("password") String password,
                                              @FormParam("department") String department,
                                              @FormParam("post") String post,
-                                             @FormParam("phoneNumber") String phoneNumber,
-                                             @FormParam("role") String role) throws Exception {
+                                             @FormParam("phoneNumber") String phoneNumber
+    ) throws Exception {
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
         try {
-            /*
-            if (pgUserManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "用户名已经存在!";
-            } else {
-            */
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             PgUser pgUser = pgUserManager.get(Long.valueOf(id));
             pgUser.setUserName(userName);
@@ -150,7 +144,7 @@
             pgUser.setDepartment(department);
             pgUser.setPost(post);
             pgUser.setPhoneNumber(phoneNumber);
-            pgUser.setPgRoleId(pgRole);
+//            pgUser.setPgRoleId(pgRole);
             pgUserManager.save(pgUser);
             result = "true";
             msg = "编辑成功";
@@ -201,5 +195,37 @@
         return resultMap;
     }
 
+    /**
+     * 登录
+     */
+    @POST
+    @Path("signIn")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> signIn(@FormParam("userName") String userName,
+                                     @FormParam("passWord") String passWord) {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
 
+        try{
+            if(pgUserManager.signIn(userName,passWord)==true)
+            {
+                msg="登录成功";
+                result="true";
+            }
+            else {
+                msg="登录失败";
+                result="false";
+            }
+        }
+        catch(Exception e){
+            msg="登陆失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
 }
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
new file mode 100644
index 0000000..c307c0b
--- /dev/null
+++ b/~WRL2471.tmp
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 7b64854..78fc55c 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2e977ca..2b77de9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,31 +7,26 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="增加道路表">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatusRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~WRL2471.tmp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/~WRL1302.tmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/接口说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/接口说明新需求.docx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" beforeDir="false" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterDir="false" />
     </list>
     <ignored path="PgInterface.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -69,26 +64,28 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="104" />
+          <entry key="java" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages" />
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="3675" />
+          <entry key="JAVA" value="8275" />
+          <entry key="PLAIN_TEXT" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.spring.boot.run.usages" />
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="3675" />
+          <entry key="java" value="8275" />
+          <entry key="txt" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="104" />
+          <entry key="JAVA" value="144" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -99,47 +96,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="418">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="440">
-              <caret line="26" selection-start-line="26" selection-end-line="26" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="986">
+              <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -164,6 +125,8 @@
       <find>getPipeGallerys</find>
       <find>getInPgNum</find>
       <find>getTodayInPgInfo</find>
+      <find>getInPgPerson</find>
+      <find>getAlarmInfo</find>
     </findStrings>
   </component>
   <component name="FindManager">
@@ -184,30 +147,39 @@
       <list>
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.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/rs/PgInPgStatusRs.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/patroler/manager/PgAlarmRuleManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.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/patroler/domain/PgMaintain.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPartitionRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.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/PgInPgPersonRs.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/patroler/domain/PgUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgUserRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java" />
       </list>
     </option>
   </component>
@@ -270,11 +242,11 @@
       </PATH>
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="3" />
-    <option name="width" value="1378" />
-    <option name="height" value="744" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="78" />
+    <option name="y" value="327" />
+    <option name="width" value="1166" />
+    <option name="height" value="555" />
   </component>
   <component name="ProjectReloadState">
     <option name="STATE" value="0" />
@@ -326,24 +298,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="construction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="devData" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
               <item name="devTable" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -397,7 +351,7 @@
     <property name="MemberChooser.sorted" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541380201282" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541416916219" />
     <property name="last_opened_file_path" value="D:/DZ/bs/PHM_DZ/.idea" />
     <property name="options.lastSelected" value="xpath.settings" />
     <property name="options.searchVisible" value="true" />
@@ -835,14 +789,7 @@
       <workItem from="1541234096986" duration="590000" />
       <workItem from="1541239096514" duration="902000" />
       <workItem from="1541303711282" duration="5696000" />
-      <workItem from="1541379811355" duration="413000" />
-    </task>
-    <task id="LOCAL-00008" summary="按资产表修改设备表">
-      <created>1513847487904</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1513847487904</updated>
+      <workItem from="1541379811355" duration="25249000" />
     </task>
     <task id="LOCAL-00009" summary="按资产表修改设备表">
       <created>1514511858811</created>
@@ -1180,11 +1127,18 @@
       <option name="project" value="LOCAL" />
       <updated>1539848140371</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="增加道路表">
+      <created>1541380241817</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1541380241817</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1031351000" />
+    <option name="totallyTimeSpent" value="1056357000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1196,21 +1150,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="3" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" id="Project" order="0" visible="true" weight="0.19878604" />
+      <window_info active="true" id="Project" order="0" sideWeight="0.9215017" visible="true" weight="0.2624811" />
       <window_info id="Structure" order="1" weight="0.25" />
       <window_info id="Palette&#9;" order="2" />
       <window_info id="Build Variants" order="3" side_tool="true" />
       <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Web" order="5" side_tool="true" />
+      <window_info id="Web" order="5" sideWeight="0.0784983" side_tool="true" visible="true" weight="0.2624811" />
       <window_info id="UI Designer" order="6" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Image Layers" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.56578946" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.5767918" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3771331" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32935154" />
@@ -1219,7 +1173,7 @@
       <window_info anchor="bottom" id="IDEtalk Messages" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.46052632" />
       <window_info anchor="bottom" id="Version Control" order="11" />
-      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32881355" />
+      <window_info anchor="bottom" id="Application Servers" order="12" weight="0.32764506" />
       <window_info anchor="bottom" id="Terminal" order="13" weight="0.32935154" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.31740615" />
       <window_info anchor="bottom" id="Android" order="15" />
@@ -1339,83 +1293,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgEquipmentManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="50" column="40" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="40" />
-        </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>
-          <caret line="100" column="37" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hibernate/hibernate-core/4.3.6.Final/hibernate-core-4.3.6.Final-sources.jar!/org/hibernate/SharedSessionContract.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="90" column="6" selection-start-line="90" selection-start-column="5" selection-end-line="90" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/util/List.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="237" column="12" selection-start-line="237" selection-start-column="12" selection-end-line="237" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="140">
-          <caret line="99" column="24" selection-start-line="99" selection-start-column="11" selection-end-line="99" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="77">
-          <caret line="309" column="7" lean-forward="true" selection-start-line="309" selection-start-column="7" selection-end-line="309" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="54" column="57" lean-forward="true" selection-start-line="54" selection-start-column="57" selection-end-line="54" selection-end-column="57" />
-        </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 relative-caret-position="114">
-          <caret line="102" column="63" selection-start-line="102" selection-start-column="63" selection-end-line="102" selection-end-column="63" />
-        </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 relative-caret-position="428">
-          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
-        </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 relative-caret-position="220">
-          <caret line="29" column="13" lean-forward="true" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-        </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 relative-caret-position="418">
@@ -1430,13 +1307,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 relative-caret-position="321">
-          <caret line="101" column="34" lean-forward="true" selection-start-line="101" selection-start-column="34" selection-end-line="101" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgStatus.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgLogRs.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1445,20 +1315,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 relative-caret-position="198">
-          <caret line="12" column="22" lean-forward="true" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="32" lean-forward="true" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgStatusDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="330">
@@ -1480,13 +1336,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 relative-caret-position="1430">
-          <caret line="83" column="25" selection-start-line="83" selection-start-column="25" selection-end-line="83" selection-end-column="25" />
-        </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 relative-caret-position="404">
@@ -1543,13 +1392,6 @@
         </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 relative-caret-position="228">
-          <caret line="203" column="7" lean-forward="true" selection-start-line="203" selection-start-column="7" selection-end-line="203" selection-end-column="7" />
-        </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 relative-caret-position="492">
@@ -1571,13 +1413,6 @@
         </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 relative-caret-position="272">
-          <caret line="159" column="9" lean-forward="true" selection-start-line="159" selection-start-column="9" selection-end-line="159" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -1613,13 +1448,6 @@
         </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 relative-caret-position="154">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-        </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 relative-caret-position="264">
@@ -1639,13 +1467,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="208">
@@ -1653,35 +1474,242 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgMaintain.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="418">
+        <state relative-caret-position="286">
           <caret line="25" selection-start-line="25" selection-end-line="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="26" selection-start-line="26" selection-end-line="26" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="154">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="22" lean-forward="true" selection-start-line="6" selection-start-column="22" selection-end-line="6" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#ConvertToDTO#0;class#PgRoadDto#0" />
+            <element signature="method#ConvertToDTOList#0;class#PgRoadDto#0" />
+            <element signature="e#912#923#0" expanded="true" />
+          </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 relative-caret-position="272">
+          <caret line="196" lean-forward="true" selection-start-line="196" selection-end-line="196" />
+          <folding>
+            <element signature="e#3833#3849#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="426">
+          <caret line="98" column="34" selection-start-line="98" selection-start-column="34" selection-end-line="98" selection-end-column="34" />
+          <folding>
+            <element signature="method#getPartitionByParName#0;class#PgPartitionManager#0" />
+            <element signature="method#isExitPartition#0;class#PgPartitionManager#0" />
+            <element signature="method#getPartitionByName#0;class#PgPartitionManager#0" />
+            <element signature="method#getPgPartitionDtoList#0;class#PgPartitionManager#0" />
+            <element signature="e#3497#3513#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1108">
+          <caret line="180" column="33" lean-forward="true" selection-start-line="180" selection-start-column="33" selection-end-line="180" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="method#getRoadList#0;class#PgRoadRs#0" />
+            <element signature="method#addRoad#0;class#PgRoadRs#0" />
+            <element signature="e#1746#1762#0" expanded="true" />
+            <element signature="method#editRoad#0;class#PgRoadRs#0" />
+            <element signature="e#2599#2615#0" expanded="true" />
+            <element signature="method#deletePgRoad#0;class#PgRoadRs#0" />
+            <element signature="e#3583#3599#0" expanded="true" />
+            <element signature="method#getParNameByRoadName#0;class#PgRoadRs#0" />
+            <element signature="e#4518#4534#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="23" column="54" lean-forward="true" selection-start-line="23" selection-start-column="54" selection-end-line="23" selection-end-column="54" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#916#927#0" expanded="true" />
+          </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 relative-caret-position="132">
+          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1430">
+          <caret line="109" column="50" lean-forward="true" selection-start-line="109" selection-start-column="50" selection-end-line="109" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
           <folding>
+            <element signature="e#203#204#0" expanded="true" />
+            <element signature="e#238#239#0" expanded="true" />
+            <element signature="e#294#295#0" expanded="true" />
+            <element signature="e#342#343#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
+          <folding>
+            <element signature="e#186#187#0" expanded="true" />
+            <element signature="e#224#225#0" expanded="true" />
+            <element signature="e#254#255#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="470">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="method#getPipeLineBylineName#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineManager#0" />
+            <element signature="method#getPipeLengthByName#0;class#PgPipeLineManager#0" />
+            <element signature="e#2576#2595#0" expanded="true" />
+            <element signature="e#3177#3199#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="171">
+          <caret line="286" column="9" lean-forward="true" selection-start-line="286" selection-start-column="9" selection-end-line="286" selection-end-column="9" />
+          <folding>
+            <element signature="method#addLog#0;class#PgPipeLineRs#0" />
+            <element signature="method#editPipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#deletePipeLine#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineByName#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLengthStatic#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeLineType#0;class#PgPipeLineRs#0" />
+            <element signature="method#getPipeNumStatic#0;class#PgPipeLineRs#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="638">
+          <caret line="45" column="13" lean-forward="true" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="13" />
+        </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 relative-caret-position="321">
+          <caret line="56" column="50" selection-start-line="56" selection-start-column="44" selection-end-line="56" selection-end-column="55" />
+          <folding>
+            <element signature="e#2248#2264#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-58">
+          <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="61" column="2" lean-forward="true" selection-start-line="61" selection-start-column="2" selection-end-line="61" selection-end-column="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="316">
+          <caret line="63" column="48" selection-start-line="63" selection-start-column="48" selection-end-line="63" selection-end-column="48" />
+        </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 relative-caret-position="330">
+          <caret line="25" column="35" lean-forward="true" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="404">
+          <caret line="71" lean-forward="true" selection-start-line="71" selection-end-line="71" />
+          <folding>
+            <element signature="method#getAllUser#0;class#PgUserManager#0" />
+            <element signature="method#userNameIsExits#0;class#PgUserManager#0" />
+            <element signature="method#getPatrolerByuserName#0;class#PgUserManager#0" />
+            <element signature="method#signIn#0;class#PgUserManager#0" />
+          </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 relative-caret-position="66">
+          <caret line="210" column="31" lean-forward="true" selection-start-line="210" selection-start-column="31" selection-end-line="210" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;class#PgUserRs#0" />
+            <element signature="method#getUserList#0;class#PgUserRs#0" />
+            <element signature="method#addUser#0;class#PgUserRs#0" />
+            <element signature="method#editUser#0;class#PgUserRs#0" />
+            <element signature="method#deleteUser#0;class#PgUserRs#0" />
+            <element signature="e#6332#6348#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="250">
+          <caret line="25" column="28" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="28" />
+          <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
@@ -1689,18 +1717,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
+        <state relative-caret-position="566">
+          <caret line="138" lean-forward="true" selection-start-line="138" selection-end-line="138" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="264">
-          <caret line="12" column="28" lean-forward="true" selection-start-line="12" selection-start-column="28" selection-end-line="12" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="986">
+          <caret line="248" column="28" selection-start-line="248" selection-start-column="28" selection-end-line="248" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
index 220d7a8..eba8814 100644
--- a/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
+++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgRoad.java
@@ -11,7 +11,7 @@
     private static final long serialVersionUID = 1L;
     private long id;
     private String roadName;
-
+    private int active;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROAD_ID")
@@ -23,7 +23,6 @@
         this.id = id;
     }
 
-
     @Column(name = "ROADNAME")
     public String getRoadName() {
         return roadName;
@@ -32,4 +31,14 @@
     public void setRoadName(String roadName) {
         this.roadName = roadName;
     }
-}
+
+    @Column(name="ACTIVE")
+    public int getActive() {
+        return active;
+    }
+
+    public void setActive(int active) {
+        this.active = active;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
new file mode 100644
index 0000000..5a96acc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeDto{
+
+    private String pipeLineType;
+
+    public String getPipeLineType() {
+        return pipeLineType;
+    }
+
+    public void setPipeLineType(String pipeLineType) {
+        this.pipeLineType = pipeLineType;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
new file mode 100644
index 0000000..03154b3
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineTypeNumDto.java
@@ -0,0 +1,14 @@
+package com.casic.PgInterface.devTable.dto;
+
+public class PgPipeLineTypeNumDto extends PgPipeLineTypeDto {
+
+    private String num;
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+}
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
index 0cb61e3..0a61485 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java
@@ -10,6 +10,7 @@
 
     private long id;
     private String roadName;
+    private String active;
 
     public long getId() {
         return id;
@@ -27,11 +28,19 @@
         this.roadName = roadName;
     }
 
-    public static PgRoadDto ConvertToDTO(PgRoad pgRoad)
-    {
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public static PgRoadDto ConvertToDTO(PgRoad pgRoad){
         PgRoadDto pgRoadDto=new PgRoadDto();
         pgRoadDto.setId(pgRoad.getId());
         pgRoadDto.setRoadName(pgRoad.getRoadName());
+        pgRoadDto.setActive(String.valueOf(pgRoad.getActive()));
 
         return pgRoadDto;
     }
@@ -44,4 +53,5 @@
 
         return pgRoadDtoList;
     }
-}
+
+}
\ No newline at end of file
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 594283e..6708e09 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java
@@ -30,7 +30,7 @@
     //获取当前报警消息列表
     public List<PgAlarmDto> getAllAlarm() {
         Criteria criteria = createCriteria(PgAlarm.class);
-        criteria.add(Restrictions.eq("active", 1));
+//        criteria.add(Restrictions.eq("active", 1));
         criteria.addOrder(Order.desc("id"));
 
         List<PgAlarm> pgAlarmList = criteria.list();
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
index 82cf045..3a3bccd 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPartitionManager.java
@@ -2,6 +2,7 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgPartition;
+import com.casic.PgInterface.devTable.domain.PgRoad;
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPartitionDto;
 import org.hibernate.Criteria;
@@ -85,6 +86,17 @@
         return pgPartitionDtoList;
     }
 
+    public List<PgPartitionDto> getPgPartitonDtoByRoad(PgRoad pgRoad){
+        Criteria criteria = getSession().createCriteria(PgPartition.class);
+        criteria.add(Restrictions.eq("pgRoadId", pgRoad.getId()));
+        criteria.add(Restrictions.eq("active",1));
 
+        List<PgPartition> pgPartitionList = criteria.list();
+        List<PgPartitionDto> pgPartitionDtoList=new ArrayList<PgPartitionDto>();
+        for(PgPartition pgPartition:pgPartitionList){
+            pgPartitionDtoList.add(new PgPartitionDto(pgPartition,pgRoadManager));
+        }
+        return pgPartitionDtoList;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
index 4cfa880..46063a6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java
@@ -4,6 +4,8 @@
 import com.casic.PgInterface.devTable.domain.PgPipeLine;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
@@ -56,19 +58,38 @@
         return pgPipeLineLengthStaticList;
     }
 
-    public  List<String> getPipeType() {
+    public  List<PgPipeLineTypeDto> getPipeType() {
         String sql = "select distinct LINE_TYPE from PG_PIPELINE";
 
         List<Object> objectList = this.getSession().createSQLQuery(sql).list();
 
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
 
         for(Object ob : objectList)
         {
-            stringList.add(String.valueOf(ob));
+            PgPipeLineTypeDto pgPipeLineTypeDto=new PgPipeLineTypeDto();
+            pgPipeLineTypeDto.setPipeLineType(String.valueOf(ob));
+            pgPipeLineTypeDtoList.add(pgPipeLineTypeDto);
         }
-        return stringList;
+        return pgPipeLineTypeDtoList;
     }
 
-}
+    public List<PgPipeLineTypeNumDto> getPipeTypeNum(){
+        String sql="select LINE_TYPE,count(*) from pg_pipeline group by line_type";
 
+        List<Object[]> objectList = this.getSession().createSQLQuery(sql).list();
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        for(Object[] ob:objectList){
+            PgPipeLineTypeNumDto pgPipeLineTypeNumDto=new PgPipeLineTypeNumDto();
+
+            pgPipeLineTypeNumDto.setPipeLineType(String.valueOf(ob[0]));
+            pgPipeLineTypeNumDto.setNum(String.valueOf(ob[1]));
+
+            pgPipeLineTypeNumDtoList.add(pgPipeLineTypeNumDto);
+        }
+
+        return pgPipeLineTypeNumDtoList;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
index 3e02b42..a9de66a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgRoadManager.java
@@ -2,15 +2,31 @@
 
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
 import org.hibernate.Criteria;
+import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
 import org.springframework.stereotype.Service;
-
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
 public class PgRoadManager extends HibernateEntityDao<PgRoad> {
 
+    public List<PgRoadDto> getAllRoad(){
+        Criteria criteria = createCriteria(PgRoad.class);
+        criteria.add(Restrictions.eq("active", 1));
+        criteria.addOrder(Order.desc("id"));
+
+        List<PgRoad> pgRoadList = criteria.list();
+        List<PgRoadDto> pgRoadDtoList = new ArrayList<PgRoadDto>();
+        for (PgRoad pgRoad : pgRoadList) {
+            pgRoadDtoList.add(PgRoadDto.ConvertToDTO(pgRoad));
+        }
+
+        return pgRoadDtoList;
+    }
+
     public PgRoad getPgRoadByName(String roadName){
         Criteria criteria=createCriteria(PgRoad.class);
 
@@ -23,4 +39,6 @@
             return null;
     }
 
-}
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
index a76886e..6ecca34 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgRole.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * Created by yxw on 2018/3/19.
@@ -20,7 +19,7 @@
     private String role;
     private int active;
     private PgAuthority pgAuthorityId;
-    private List<PgUser> pgUsers;
+//    private List<PgUser> pgUsers;
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ROLE_ID")
@@ -60,14 +59,14 @@
     public void setPgAuthorityId(PgAuthority pgAuthorityId) {
         this.pgAuthorityId = pgAuthorityId;
     }
-
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
-    public List<PgUser> getPgUsers() {
-        return pgUsers;
-    }
-
-    public void setPgUsers(List<PgUser> pgUsers) {
-        this.pgUsers = pgUsers;
-    }
+//
+//    @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgRoleId")
+//    public List<PgUser> getPgUsers() {
+//        return pgUsers;
+//    }
+//
+//    public void setPgUsers(List<PgUser> pgUsers) {
+//        this.pgUsers = pgUsers;
+//    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
index a3c865b..9fdc491 100644
--- a/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
+++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgUser.java
@@ -1,8 +1,6 @@
 package com.casic.PgInterface.patroler.domain;
 
 import com.casic.PgInterface.devTable.domain.PgAlarm;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -24,7 +22,7 @@
     private String post;//职务
     private String phoneNumber;//电话
     private int active;//状态位
-    private PgRole pgRoleId;//权限
+//    private PgRole pgRoleId;//权限
     private List<PgAlarm> pgAlarms;
     private List<PgLog> pgLogs;
 
@@ -92,16 +90,16 @@
         this.active = active;
     }
 
-    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
-    @NotFound(action = NotFoundAction.IGNORE)
-    @JoinColumn(name = "ROLEID")
-    public PgRole getPgRoleId() {
-        return pgRoleId;
-    }
-
-    public void setPgRoleId(PgRole pgRoleId) {
-        this.pgRoleId = pgRoleId;
-    }
+//    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST})
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    @JoinColumn(name = "ROLEID")
+//    public PgRole getPgRoleId() {
+//        return pgRoleId;
+//    }
+//
+//    public void setPgRoleId(PgRole pgRoleId) {
+//        this.pgRoleId = pgRoleId;
+//    }
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "userId")
     public List<PgAlarm> getPgAlarms() {
diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
index c2a2ee1..d2b9db4 100644
--- a/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
+++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java
@@ -35,8 +35,7 @@
     }
 
     //查询人员是否存在
-    public boolean userNameIsExits(String userName)
-    {
+    public boolean userNameIsExits(String userName) {
         Criteria criteria = getSession().createCriteria(PgUser.class);
         criteria.add(Restrictions.eq("active", 1));
         criteria.add(Restrictions.eq("userName", userName));
@@ -59,4 +58,14 @@
             return null;
     }
 
+    public boolean signIn(String userName,String passWord){
+
+        String sql="select PASSWORD from PG_USER where USERNAME = '"+userName+"' and active = 1";
+
+        Object object=this.getSession().createSQLQuery(sql).list();
+
+        if(String.valueOf(((List) object).get(0)).equals(passWord)) return true;
+        else return false;
+    }
+
 }
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
index 2b9c5ec..2f2cb55 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java
@@ -31,34 +31,18 @@
 
     private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class);
 
+    @Resource
     private PgAlarmTypeManager pgAlarmTypeManager;
 
+    @Resource
     private PgAlarmManager pgAlarmManager;
 
+    @Resource
     private PgUserManager pgPatrolerManager;
 
+    @Resource
     private PgDeviceManager pgDeviceManager;
 
-    @Resource
-    public void setPgAlarmManager(PgAlarmManager pgAlarmManager) {
-        this.pgAlarmManager = pgAlarmManager;
-    }
-
-    @Resource
-    public void setPgPatrolerManager(PgUserManager pgPatrolerManager) {
-        this.pgPatrolerManager = pgPatrolerManager;
-    }
-
-    @Resource
-    public void setPgDeviceManager(PgDeviceManager pgDeviceManager) {
-        this.pgDeviceManager = pgDeviceManager;
-    }
-
-    @Resource
-    public void setPgAlarmTypeManager(PgAlarmTypeManager pgAlarmTypeManager) {
-        this.pgAlarmTypeManager = pgAlarmTypeManager;
-    }
-
     /**
      * 获取报警信息
      */
@@ -137,10 +121,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {
             PgAlarm pgAlarm = new PgAlarm();
-//            if (!pgPatrolerManager.userNameIsExits(userName)) {
-//                result = "false";
-//                msg = "不存在该用户!";
-//            } else {
                 pgAlarm.setAlarmTypeId(pgAlarmTypeManager.getAlarmTypeByAlarmType(alarmType));
                 pgAlarm.setAlarmValue(alarmValue);
                 pgAlarm.setAlarmDate(sdf.parse(alarmDate));
@@ -153,7 +133,6 @@
                 pgAlarmManager.save(pgAlarm);
                 result = "true";
                 msg = "保存成功";
-//            }
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 5a71af5..6b53265 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -53,8 +53,6 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-//            PgInPgStatus pgInPgStatus = new PgInPgStatus();
-
             PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
             if (pgInPgPerson == null) {
                 PgInPgPerson pgInPgPerson1=new PgInPgPerson();
@@ -66,7 +64,6 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-//                pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
                 result = "true";
                 msg = "保存成功";
             }
@@ -74,11 +71,6 @@
                 result = "false";
                 msg = "存在人员信息";
             }
-           /* pgInPgStatus.setInTime(sdf.parse(inTime));
-            pgInPgStatus.setPgInPgPersonId(pgInPgPerson);
-
-            pgInPgStatusManager.save(pgInPgStatus);*/
-
         } catch (Exception e) {
             result = "false";
             msg = "保存失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
index 41f7374..36f8a2e 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java
@@ -5,6 +5,8 @@
 import com.casic.PgInterface.devTable.domain.PipeGallery;
 import com.casic.PgInterface.devTable.dto.PgPipeLineDto;
 import com.casic.PgInterface.devTable.dto.PgPipeLineLengthStatic;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeDto;
+import com.casic.PgInterface.devTable.dto.PgPipeLineTypeNumDto;
 import com.casic.PgInterface.devTable.manager.PgPartitionManager;
 import com.casic.PgInterface.devTable.manager.PgPipeLineManager;
 import com.casic.PgInterface.devTable.manager.PipeGalleryManager;
@@ -56,8 +58,7 @@
                                       @FormParam("diameter") String diameter,
                                       @FormParam("pipeLength") String pipeLength,
                                       @FormParam("pgName") String pgName,
-                                      @FormParam("parName") String parName)
-            throws Exception {
+                                      @FormParam("parName") String parName) throws Exception {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
@@ -213,8 +214,7 @@
     @POST
     @Path("getPipeLineByLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType)
-            throws Exception {
+    public Map<String, Object> getPipeLineByLineType(@FormParam("lineType") String lineType) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         List<PgPipeLineDto> pgPipeLineDtoList=new ArrayList<PgPipeLineDto>();
@@ -236,8 +236,7 @@
     @POST
     @Path("getPipeLineByName")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName)
-            throws Exception {
+    public Map<String, Object> getPipeLineByName(@FormParam("lineName") String lineName) throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
         PgPipeLineDto pgPipeLineDto=null;
@@ -288,20 +287,49 @@
     @POST
     @Path("getPipeLineType")
     @Produces(MediaType.APPLICATION_JSON)
-    public Map<String, Object> getPipeLineType()
-            throws Exception {
+    public Map<String, Object> getPipeLineType() throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String msg = "";
-        List<String> stringList=new ArrayList<String>();
+        List<PgPipeLineTypeDto> pgPipeLineTypeDtoList=new ArrayList<PgPipeLineTypeDto>();
         try {
-            stringList = pgPipeLineManager.getPipeType();
+            pgPipeLineTypeDtoList = pgPipeLineManager.getPipeType();
             msg = "获取成功";
         } catch (Exception e) {
             msg = "获取失败";
             e.printStackTrace();
         }
         resultMap.put("msg", msg);
-        resultMap.put("result", stringList);
+        resultMap.put("result", pgPipeLineTypeDtoList);
+        return resultMap;
+    }
+
+    /**
+     * 根据管线名称获取管线数量
+     */
+    @POST
+    @Path("getPipeNumStatic")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getPipeNumStatic() throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgPipeLineTypeNumDto> pgPipeLineTypeNumDtoList=new ArrayList<PgPipeLineTypeNumDto>();
+
+        try{
+            pgPipeLineTypeNumDtoList=pgPipeLineManager.getPipeTypeNum();
+
+            if(pgPipeLineTypeNumDtoList==null)
+                msg="不存在管线类型占比";
+            else
+                msg="管线占比获取成功";
+        }
+        catch (Exception e){
+            msg="管线占比数量获取失败";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPipeLineTypeNumDtoList);
+
         return resultMap;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
new file mode 100644
index 0000000..8f049c8
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgRoadRs.java
@@ -0,0 +1,213 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.devTable.domain.PgRoad;
+import com.casic.PgInterface.devTable.dto.PgPartitionDto;
+import com.casic.PgInterface.devTable.dto.PgRoadDto;
+import com.casic.PgInterface.devTable.manager.PgPartitionManager;
+import com.casic.PgInterface.devTable.manager.PgRoadManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgRoad")
+public class PgRoadRs {
+    private static Logger logger = LoggerFactory.getLogger(PgRoad.class);
+
+    @Resource
+    private PgRoadManager pgRoadManager;
+
+    @Resource
+    private PgPartitionManager pgPartitionManager;
+
+    /**
+     * 获取道路信息
+     */
+    @POST
+    @Path("getRoadList")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getRoadList(){
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        List<PgRoadDto> pgRoadDtoList=new ArrayList<PgRoadDto>();
+        try{
+            pgRoadDtoList = pgRoadManager.getAllRoad();
+            if (pgRoadDtoList.size() == 0)
+                msg = "没有道路信息";
+            else
+                msg = "道路信息获取成功";
+        }
+        catch(Exception e){
+            msg="道路信息获取失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgRoadDtoList);
+
+        return resultMap;
+    }
+
+    /**
+     * 新增道路信息
+     */
+    @POST
+    @Path("addRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> addRoad(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        try{
+            PgRoad pgRoad=new PgRoad();
+            pgRoad.setRoadName(roadName);
+            pgRoad.setActive(1);
+
+            pgRoadManager.save(pgRoad);
+
+            msg="新增道路成功";
+            result="true";
+        }
+        catch (Exception e){
+            msg="新增道路失败";
+            result="true";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 编辑道路信息
+     */
+    @POST
+    @Path("editRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> editRoad(@FormParam("id") String id,
+                                       @FormParam("roadName") String roadName)throws Exception{
+
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+
+        try {
+            PgRoad pgRoad=pgRoadManager.get(Long.valueOf(id));
+
+            if(pgRoad==null)
+            {
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setRoadName(roadName);
+                pgRoad.setActive(1);
+
+                pgRoadManager.save(pgRoad);
+                msg="道路信息保存成功";
+                result="true";
+            }
+        }
+        catch(Exception e){
+            msg="道路信息编辑失败";
+            result="false";
+            e.printStackTrace();
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 删除道路阈值
+     */
+    @POST
+    @Path("deleteRoad")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String, Object> deleteRoad(@FormParam("id") String id) throws Exception {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+
+        String msg="";
+        String result="";
+        PgRoad pgRoad=null;
+
+        try{
+            pgRoad=pgRoadManager.get(Long.valueOf(id));
+            if(pgRoad==null){
+                msg="不存在道路信息";
+                result="false";
+            }
+            else{
+                pgRoad.setActive(0);
+                pgRoadManager.save(pgRoad);
+                msg="道路删除成功";
+                result="true";
+            }
+        }
+        catch (Exception e){
+            msg="道路删除出错";
+            result="false";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
+
+    /**
+     * 根据道路获取分区信息
+     */
+    @POST
+    @Path("getParNameByRoadName")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getParNameByRoadName(@FormParam("roadName") String roadName)throws Exception{
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
+
+        List<PgPartitionDto> pgPartitionDtoList=null;
+        try{
+            PgRoad pgRoad=pgRoadManager.getPgRoadByName(roadName);
+            if(pgRoad==null)
+                msg="不存在道路信息";
+            else
+            {
+                pgPartitionDtoList=pgPartitionManager.getPgPartitonDtoByRoad(pgRoad);
+                if(pgPartitionDtoList==null||pgPartitionDtoList.size()==0)
+                    msg="该道路没有分区信息";
+                else
+                    msg="分区信息获取成功";
+            }
+        }
+        catch (Exception e)
+        {
+            msg="分区信息获取失败";
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgPartitionDtoList);
+
+        return resultMap;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
index 612597e..6d310bd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgUserRs.java
@@ -1,6 +1,5 @@
 package com.casic.PgInterface.rs;
 
-import com.casic.PgInterface.patroler.domain.PgRole;
 import com.casic.PgInterface.patroler.domain.PgUser;
 import com.casic.PgInterface.patroler.dto.PgUserDto;
 import com.casic.PgInterface.patroler.manager.PgRoleManager;
@@ -78,14 +77,14 @@
                                            @FormParam("password") String password,
                                            @FormParam("department") String department,
                                            @FormParam("post") String post,
-                                           @FormParam("phoneNumber") String phoneNumber,
-                                           @FormParam("role") String role)throws Exception {
+                                           @FormParam("phoneNumber") String phoneNumber
+    )throws Exception {
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
 
         try {
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             if (pgUserManager.userNameIsExits(userName)) {
                 result = "false";
@@ -99,7 +98,7 @@
                 pgUser.setDepartment(department);
                 pgUser.setPost(post);
                 pgUser.setPhoneNumber(phoneNumber);
-                pgUser.setPgRoleId(pgRole);
+//                pgUser.setPgRoleId(pgRole);
                 pgUser.setActive(1);
                 logger.info("成功保存");
 
@@ -129,20 +128,15 @@
                                              @FormParam("password") String password,
                                              @FormParam("department") String department,
                                              @FormParam("post") String post,
-                                             @FormParam("phoneNumber") String phoneNumber,
-                                             @FormParam("role") String role) throws Exception {
+                                             @FormParam("phoneNumber") String phoneNumber
+    ) throws Exception {
 
         Map<String, Object> resultMap = new HashMap<String, Object>();
         String result = "";
         String msg = "";
         try {
-            /*
-            if (pgUserManager.userNameIsExits(userName)) {
-                result = "false";
-                msg = "用户名已经存在!";
-            } else {
-            */
-            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
+
+//            PgRole pgRole=pgRoleManager.getPgRoleByRole(role);
 
             PgUser pgUser = pgUserManager.get(Long.valueOf(id));
             pgUser.setUserName(userName);
@@ -150,7 +144,7 @@
             pgUser.setDepartment(department);
             pgUser.setPost(post);
             pgUser.setPhoneNumber(phoneNumber);
-            pgUser.setPgRoleId(pgRole);
+//            pgUser.setPgRoleId(pgRole);
             pgUserManager.save(pgUser);
             result = "true";
             msg = "编辑成功";
@@ -201,5 +195,37 @@
         return resultMap;
     }
 
+    /**
+     * 登录
+     */
+    @POST
+    @Path("signIn")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> signIn(@FormParam("userName") String userName,
+                                     @FormParam("passWord") String passWord) {
+        Map<String,Object> resultMap=new HashMap<String, Object>();
+        String msg="";
+        String result="";
 
+        try{
+            if(pgUserManager.signIn(userName,passWord)==true)
+            {
+                msg="登录成功";
+                result="true";
+            }
+            else {
+                msg="登录失败";
+                result="false";
+            }
+        }
+        catch(Exception e){
+            msg="登陆失败";
+            e.printStackTrace();
+        }
+
+        resultMap.put("msg",msg);
+        resultMap.put("result",result);
+
+        return resultMap;
+    }
 }
diff --git a/~WRL2471.tmp b/~WRL2471.tmp
new file mode 100644
index 0000000..c307c0b
--- /dev/null
+++ b/~WRL2471.tmp
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 7b64854..78fc55c 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index b464352..dfc15bf 100644
--- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ