diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87198c5..9df45c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_001__BR_APPROVAL_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_002__BR_APPROVAL_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_003__BR_APPROVAL_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_004__BR_APPROVAL_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_005__BR_SUPERVISE_WEEKLY_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_006__BR_SUPERVISE_WEEKLY_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_007__BR_SUPERVISE_WEEKLY_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_008__BR_SUPERVISE_WEEKLY_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_009__BR_CONSTRUCTION_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_010__BR_CONSTRUCTION_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_011__BR_CONSTRUCTION_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_012__BR_CONSTRUCTION_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_013__BR_CONSTRUCTION_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_014__BR_CONSTRUCTION_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_015__BR_CONSTRUCTION_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_016__BR_CONSTRUCTION_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_017__BR_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_018__BR_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_019__BR_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_020__BR_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_021__BR_PROJECT_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_022__BR_PROJECT_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_023__BR_PROJECT_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_024__BR_PROJECT_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_025__BR_PROJECT_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_026__BR_PROJECT_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_027__BR_PROJECT_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_028__BR_PROJECT_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_029__BR_SUPERVISE_CHECK_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_030__BR_SUPERVISE_CHECK_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_031__BR_SUPERVISE_CHECK_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_032__BR_SUPERVISE_CHECK_DATA.sql" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PgInterface.iml" afterPath="$PROJECT_DIR$/PgInterface.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -78,18 +30,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgAlarm.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -107,7 +48,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
@@ -145,12 +85,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
@@ -158,6 +95,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -218,9 +159,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="-2" />
-    <option name="width" value="1378" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -305,6 +246,28 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -369,40 +332,6 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -952,7 +881,10 @@
       <workItem from="1528333983724" duration="2699000" />
       <workItem from="1528349219682" duration="721000" />
       <workItem from="1528421791812" duration="2287000" />
-      <workItem from="1528771293143" duration="5775000" />
+      <workItem from="1528771293143" duration="9272000" />
+      <workItem from="1528961860313" duration="3105000" />
+      <workItem from="1530094500311" duration="4260000" />
+      <workItem from="1530146280841" duration="2278000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1106,11 +1038,15 @@
       <created>1523494952341</created>
       <updated>1523494952341</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
+      <created>1528783523876</created>
+      <updated>1528783523876</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="682781000" />
+    <option name="totallyTimeSpent" value="695921000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1133,7 +1069,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="-2" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1145,7 +1081,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48205128" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44102564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1158,7 +1094,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21676737" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1187,7 +1123,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
     <MESSAGE value="修改新增文件方法 by ym" />
@@ -1212,11 +1147,20 @@
     <MESSAGE value="新增项目状态管理" />
     <MESSAGE value="修改时间检索的格式" />
     <MESSAGE value="新增当天在建工程统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
+    <MESSAGE value="修改监测设备获取信息字段名称" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改监测设备获取信息字段名称" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="169" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
+          <line>63</line>
+          <properties />
+          <option name="timeStamp" value="169" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="185" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1224,20 +1168,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9422151" vertical-offset="268" max-vertical-offset="1900">
-          <caret line="52" column="70" selection-start-line="52" selection-start-column="70" selection-end-line="52" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1482">
-          <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="413" max-vertical-offset="3477">
@@ -1393,13 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1282052" vertical-offset="792" max-vertical-offset="2420">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3229358" vertical-offset="1452" max-vertical-offset="2112">
@@ -1472,13 +1395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1684" max-vertical-offset="2486">
-          <caret line="159" column="51" selection-start-line="159" selection-start-column="51" selection-end-line="159" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.48" vertical-offset="661" max-vertical-offset="1320">
@@ -1486,49 +1402,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="2636" max-vertical-offset="5170">
-          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7172">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="3388">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.609319" vertical-offset="122" max-vertical-offset="946">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" expanded="false" />
-            <marker date="1528771347258" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23655914" vertical-offset="330" max-vertical-offset="2310">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1536,15 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.609319" vertical-offset="408" max-vertical-offset="2332">
           <caret line="54" column="59" selection-start-line="54" selection-start-column="59" selection-end-line="54" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="408" max-vertical-offset="2288">
-          <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1552,18 +1420,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.1577061" vertical-offset="1320" max-vertical-offset="2288">
           <caret line="84" column="42" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
-          <folding>
-            <element signature="e#1627#1643#0" expanded="false" />
-            <element signature="e#2741#2757#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
-          <caret line="72" column="36" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1595,14 +1451,106 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="858">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="672" max-vertical-offset="2288">
+          <caret line="61" column="48" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8817204" vertical-offset="234" max-vertical-offset="1122">
+          <caret line="48" column="39" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33215547" vertical-offset="2634" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60183483" vertical-offset="1542" max-vertical-offset="2134">
+          <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
+          <folding>
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#2009#2022#0" expanded="true" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#3855#3868#0" expanded="true" />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43189964" vertical-offset="7173" max-vertical-offset="7876">
+          <caret line="357" column="9" selection-start-line="357" selection-start-column="9" selection-end-line="357" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15591398" vertical-offset="551" max-vertical-offset="2618">
+          <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+          <folding>
+            <element signature="e#909#910#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5322581" vertical-offset="297" max-vertical-offset="3388">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="814">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43369177" vertical-offset="198" max-vertical-offset="2420">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87198c5..9df45c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_001__BR_APPROVAL_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_002__BR_APPROVAL_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_003__BR_APPROVAL_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_004__BR_APPROVAL_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_005__BR_SUPERVISE_WEEKLY_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_006__BR_SUPERVISE_WEEKLY_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_007__BR_SUPERVISE_WEEKLY_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_008__BR_SUPERVISE_WEEKLY_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_009__BR_CONSTRUCTION_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_010__BR_CONSTRUCTION_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_011__BR_CONSTRUCTION_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_012__BR_CONSTRUCTION_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_013__BR_CONSTRUCTION_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_014__BR_CONSTRUCTION_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_015__BR_CONSTRUCTION_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_016__BR_CONSTRUCTION_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_017__BR_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_018__BR_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_019__BR_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_020__BR_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_021__BR_PROJECT_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_022__BR_PROJECT_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_023__BR_PROJECT_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_024__BR_PROJECT_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_025__BR_PROJECT_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_026__BR_PROJECT_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_027__BR_PROJECT_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_028__BR_PROJECT_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_029__BR_SUPERVISE_CHECK_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_030__BR_SUPERVISE_CHECK_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_031__BR_SUPERVISE_CHECK_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_032__BR_SUPERVISE_CHECK_DATA.sql" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PgInterface.iml" afterPath="$PROJECT_DIR$/PgInterface.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -78,18 +30,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgAlarm.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -107,7 +48,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
@@ -145,12 +85,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
@@ -158,6 +95,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -218,9 +159,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="-2" />
-    <option name="width" value="1378" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -305,6 +246,28 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -369,40 +332,6 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -952,7 +881,10 @@
       <workItem from="1528333983724" duration="2699000" />
       <workItem from="1528349219682" duration="721000" />
       <workItem from="1528421791812" duration="2287000" />
-      <workItem from="1528771293143" duration="5775000" />
+      <workItem from="1528771293143" duration="9272000" />
+      <workItem from="1528961860313" duration="3105000" />
+      <workItem from="1530094500311" duration="4260000" />
+      <workItem from="1530146280841" duration="2278000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1106,11 +1038,15 @@
       <created>1523494952341</created>
       <updated>1523494952341</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
+      <created>1528783523876</created>
+      <updated>1528783523876</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="682781000" />
+    <option name="totallyTimeSpent" value="695921000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1133,7 +1069,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="-2" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1145,7 +1081,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48205128" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44102564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1158,7 +1094,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21676737" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1187,7 +1123,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
     <MESSAGE value="修改新增文件方法 by ym" />
@@ -1212,11 +1147,20 @@
     <MESSAGE value="新增项目状态管理" />
     <MESSAGE value="修改时间检索的格式" />
     <MESSAGE value="新增当天在建工程统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
+    <MESSAGE value="修改监测设备获取信息字段名称" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改监测设备获取信息字段名称" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="169" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
+          <line>63</line>
+          <properties />
+          <option name="timeStamp" value="169" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="185" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1224,20 +1168,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9422151" vertical-offset="268" max-vertical-offset="1900">
-          <caret line="52" column="70" selection-start-line="52" selection-start-column="70" selection-end-line="52" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1482">
-          <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="413" max-vertical-offset="3477">
@@ -1393,13 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1282052" vertical-offset="792" max-vertical-offset="2420">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3229358" vertical-offset="1452" max-vertical-offset="2112">
@@ -1472,13 +1395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1684" max-vertical-offset="2486">
-          <caret line="159" column="51" selection-start-line="159" selection-start-column="51" selection-end-line="159" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.48" vertical-offset="661" max-vertical-offset="1320">
@@ -1486,49 +1402,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="2636" max-vertical-offset="5170">
-          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7172">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="3388">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.609319" vertical-offset="122" max-vertical-offset="946">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" expanded="false" />
-            <marker date="1528771347258" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23655914" vertical-offset="330" max-vertical-offset="2310">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1536,15 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.609319" vertical-offset="408" max-vertical-offset="2332">
           <caret line="54" column="59" selection-start-line="54" selection-start-column="59" selection-end-line="54" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="408" max-vertical-offset="2288">
-          <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1552,18 +1420,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.1577061" vertical-offset="1320" max-vertical-offset="2288">
           <caret line="84" column="42" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
-          <folding>
-            <element signature="e#1627#1643#0" expanded="false" />
-            <element signature="e#2741#2757#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
-          <caret line="72" column="36" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1595,14 +1451,106 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="858">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="672" max-vertical-offset="2288">
+          <caret line="61" column="48" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8817204" vertical-offset="234" max-vertical-offset="1122">
+          <caret line="48" column="39" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33215547" vertical-offset="2634" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60183483" vertical-offset="1542" max-vertical-offset="2134">
+          <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
+          <folding>
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#2009#2022#0" expanded="true" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#3855#3868#0" expanded="true" />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43189964" vertical-offset="7173" max-vertical-offset="7876">
+          <caret line="357" column="9" selection-start-line="357" selection-start-column="9" selection-end-line="357" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15591398" vertical-offset="551" max-vertical-offset="2618">
+          <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+          <folding>
+            <element signature="e#909#910#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5322581" vertical-offset="297" max-vertical-offset="3388">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="814">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43369177" vertical-offset="198" max-vertical-offset="2420">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
index 7b491d4..5a7aec8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
@@ -148,6 +148,10 @@
 
     public PgDeviceDto(PgDevice pgDevice) {
 
+        if (pgDevice == null)
+        {
+            return;
+        }
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgDevice.getId()));

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87198c5..9df45c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_001__BR_APPROVAL_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_002__BR_APPROVAL_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_003__BR_APPROVAL_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_004__BR_APPROVAL_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_005__BR_SUPERVISE_WEEKLY_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_006__BR_SUPERVISE_WEEKLY_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_007__BR_SUPERVISE_WEEKLY_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_008__BR_SUPERVISE_WEEKLY_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_009__BR_CONSTRUCTION_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_010__BR_CONSTRUCTION_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_011__BR_CONSTRUCTION_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_012__BR_CONSTRUCTION_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_013__BR_CONSTRUCTION_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_014__BR_CONSTRUCTION_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_015__BR_CONSTRUCTION_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_016__BR_CONSTRUCTION_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_017__BR_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_018__BR_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_019__BR_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_020__BR_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_021__BR_PROJECT_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_022__BR_PROJECT_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_023__BR_PROJECT_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_024__BR_PROJECT_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_025__BR_PROJECT_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_026__BR_PROJECT_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_027__BR_PROJECT_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_028__BR_PROJECT_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_029__BR_SUPERVISE_CHECK_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_030__BR_SUPERVISE_CHECK_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_031__BR_SUPERVISE_CHECK_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_032__BR_SUPERVISE_CHECK_DATA.sql" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PgInterface.iml" afterPath="$PROJECT_DIR$/PgInterface.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -78,18 +30,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgAlarm.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -107,7 +48,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
@@ -145,12 +85,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
@@ -158,6 +95,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -218,9 +159,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="-2" />
-    <option name="width" value="1378" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -305,6 +246,28 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -369,40 +332,6 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -952,7 +881,10 @@
       <workItem from="1528333983724" duration="2699000" />
       <workItem from="1528349219682" duration="721000" />
       <workItem from="1528421791812" duration="2287000" />
-      <workItem from="1528771293143" duration="5775000" />
+      <workItem from="1528771293143" duration="9272000" />
+      <workItem from="1528961860313" duration="3105000" />
+      <workItem from="1530094500311" duration="4260000" />
+      <workItem from="1530146280841" duration="2278000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1106,11 +1038,15 @@
       <created>1523494952341</created>
       <updated>1523494952341</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
+      <created>1528783523876</created>
+      <updated>1528783523876</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="682781000" />
+    <option name="totallyTimeSpent" value="695921000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1133,7 +1069,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="-2" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1145,7 +1081,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48205128" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44102564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1158,7 +1094,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21676737" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1187,7 +1123,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
     <MESSAGE value="修改新增文件方法 by ym" />
@@ -1212,11 +1147,20 @@
     <MESSAGE value="新增项目状态管理" />
     <MESSAGE value="修改时间检索的格式" />
     <MESSAGE value="新增当天在建工程统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
+    <MESSAGE value="修改监测设备获取信息字段名称" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改监测设备获取信息字段名称" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="169" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
+          <line>63</line>
+          <properties />
+          <option name="timeStamp" value="169" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="185" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1224,20 +1168,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9422151" vertical-offset="268" max-vertical-offset="1900">
-          <caret line="52" column="70" selection-start-line="52" selection-start-column="70" selection-end-line="52" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1482">
-          <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="413" max-vertical-offset="3477">
@@ -1393,13 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1282052" vertical-offset="792" max-vertical-offset="2420">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3229358" vertical-offset="1452" max-vertical-offset="2112">
@@ -1472,13 +1395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1684" max-vertical-offset="2486">
-          <caret line="159" column="51" selection-start-line="159" selection-start-column="51" selection-end-line="159" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.48" vertical-offset="661" max-vertical-offset="1320">
@@ -1486,49 +1402,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="2636" max-vertical-offset="5170">
-          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7172">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="3388">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.609319" vertical-offset="122" max-vertical-offset="946">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" expanded="false" />
-            <marker date="1528771347258" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23655914" vertical-offset="330" max-vertical-offset="2310">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1536,15 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.609319" vertical-offset="408" max-vertical-offset="2332">
           <caret line="54" column="59" selection-start-line="54" selection-start-column="59" selection-end-line="54" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="408" max-vertical-offset="2288">
-          <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1552,18 +1420,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.1577061" vertical-offset="1320" max-vertical-offset="2288">
           <caret line="84" column="42" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
-          <folding>
-            <element signature="e#1627#1643#0" expanded="false" />
-            <element signature="e#2741#2757#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
-          <caret line="72" column="36" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1595,14 +1451,106 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="858">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="672" max-vertical-offset="2288">
+          <caret line="61" column="48" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8817204" vertical-offset="234" max-vertical-offset="1122">
+          <caret line="48" column="39" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33215547" vertical-offset="2634" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60183483" vertical-offset="1542" max-vertical-offset="2134">
+          <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
+          <folding>
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#2009#2022#0" expanded="true" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#3855#3868#0" expanded="true" />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43189964" vertical-offset="7173" max-vertical-offset="7876">
+          <caret line="357" column="9" selection-start-line="357" selection-start-column="9" selection-end-line="357" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15591398" vertical-offset="551" max-vertical-offset="2618">
+          <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+          <folding>
+            <element signature="e#909#910#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5322581" vertical-offset="297" max-vertical-offset="3388">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="814">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43369177" vertical-offset="198" max-vertical-offset="2420">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
index 7b491d4..5a7aec8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
@@ -148,6 +148,10 @@
 
     public PgDeviceDto(PgDevice pgDevice) {
 
+        if (pgDevice == null)
+        {
+            return;
+        }
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgDevice.getId()));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index f97c322..5f713f6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -99,4 +99,36 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode)
+    {
+        String[] stringList=assetCode.split("\\.");
+
+        String hql="select * from PG_DEVICE device where device.assetCode like '%"+stringList[1]+"%' and device.assetCode like '%"+stringList[2]+"'";
+
+        List<Object[]> pgDevices=(List<Object[]>)this.getSession().createSQLQuery(hql).list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+
+        for (int i = 0; i<pgDevices.size();i++)
+        {
+            Object[] objects = pgDevices.get(i);
+            PgDeviceDto dto = new PgDeviceDto(null);
+            dto.setId(objects[0].toString());
+            dto.setActive(objects[1].toString());
+            dto.setAssetCode(objects[3].toString());
+            dto.setAssetName(objects[4].toString());
+            dto.setDevCode(objects[5].toString());
+            dto.setDevType(objects[6].toString());
+            dto.setIp(objects[7].toString());
+            dto.setIsOpen(objects[8].toString());
+            dto.setPartition(objects[11].toString());
+            dto.setPipeGallery(objects[12].toString());
+            dto.setPosition(objects[13].toString());
+            dto.setRoad(objects[14].toString());
+
+            pgDeviceDtoList.add(dto);
+        }
+        return pgDeviceDtoList;
+    }
+
 }
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87198c5..9df45c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_001__BR_APPROVAL_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_002__BR_APPROVAL_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_003__BR_APPROVAL_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_004__BR_APPROVAL_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_005__BR_SUPERVISE_WEEKLY_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_006__BR_SUPERVISE_WEEKLY_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_007__BR_SUPERVISE_WEEKLY_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_008__BR_SUPERVISE_WEEKLY_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_009__BR_CONSTRUCTION_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_010__BR_CONSTRUCTION_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_011__BR_CONSTRUCTION_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_012__BR_CONSTRUCTION_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_013__BR_CONSTRUCTION_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_014__BR_CONSTRUCTION_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_015__BR_CONSTRUCTION_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_016__BR_CONSTRUCTION_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_017__BR_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_018__BR_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_019__BR_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_020__BR_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_021__BR_PROJECT_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_022__BR_PROJECT_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_023__BR_PROJECT_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_024__BR_PROJECT_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_025__BR_PROJECT_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_026__BR_PROJECT_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_027__BR_PROJECT_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_028__BR_PROJECT_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_029__BR_SUPERVISE_CHECK_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_030__BR_SUPERVISE_CHECK_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_031__BR_SUPERVISE_CHECK_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_032__BR_SUPERVISE_CHECK_DATA.sql" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PgInterface.iml" afterPath="$PROJECT_DIR$/PgInterface.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -78,18 +30,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgAlarm.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -107,7 +48,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
@@ -145,12 +85,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
@@ -158,6 +95,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -218,9 +159,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="-2" />
-    <option name="width" value="1378" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -305,6 +246,28 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -369,40 +332,6 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -952,7 +881,10 @@
       <workItem from="1528333983724" duration="2699000" />
       <workItem from="1528349219682" duration="721000" />
       <workItem from="1528421791812" duration="2287000" />
-      <workItem from="1528771293143" duration="5775000" />
+      <workItem from="1528771293143" duration="9272000" />
+      <workItem from="1528961860313" duration="3105000" />
+      <workItem from="1530094500311" duration="4260000" />
+      <workItem from="1530146280841" duration="2278000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1106,11 +1038,15 @@
       <created>1523494952341</created>
       <updated>1523494952341</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
+      <created>1528783523876</created>
+      <updated>1528783523876</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="682781000" />
+    <option name="totallyTimeSpent" value="695921000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1133,7 +1069,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="-2" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1145,7 +1081,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48205128" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44102564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1158,7 +1094,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21676737" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1187,7 +1123,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
     <MESSAGE value="修改新增文件方法 by ym" />
@@ -1212,11 +1147,20 @@
     <MESSAGE value="新增项目状态管理" />
     <MESSAGE value="修改时间检索的格式" />
     <MESSAGE value="新增当天在建工程统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
+    <MESSAGE value="修改监测设备获取信息字段名称" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改监测设备获取信息字段名称" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="169" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
+          <line>63</line>
+          <properties />
+          <option name="timeStamp" value="169" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="185" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1224,20 +1168,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9422151" vertical-offset="268" max-vertical-offset="1900">
-          <caret line="52" column="70" selection-start-line="52" selection-start-column="70" selection-end-line="52" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1482">
-          <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="413" max-vertical-offset="3477">
@@ -1393,13 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1282052" vertical-offset="792" max-vertical-offset="2420">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3229358" vertical-offset="1452" max-vertical-offset="2112">
@@ -1472,13 +1395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1684" max-vertical-offset="2486">
-          <caret line="159" column="51" selection-start-line="159" selection-start-column="51" selection-end-line="159" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.48" vertical-offset="661" max-vertical-offset="1320">
@@ -1486,49 +1402,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="2636" max-vertical-offset="5170">
-          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7172">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="3388">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.609319" vertical-offset="122" max-vertical-offset="946">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" expanded="false" />
-            <marker date="1528771347258" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23655914" vertical-offset="330" max-vertical-offset="2310">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1536,15 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.609319" vertical-offset="408" max-vertical-offset="2332">
           <caret line="54" column="59" selection-start-line="54" selection-start-column="59" selection-end-line="54" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="408" max-vertical-offset="2288">
-          <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1552,18 +1420,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.1577061" vertical-offset="1320" max-vertical-offset="2288">
           <caret line="84" column="42" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
-          <folding>
-            <element signature="e#1627#1643#0" expanded="false" />
-            <element signature="e#2741#2757#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
-          <caret line="72" column="36" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1595,14 +1451,106 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="858">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="672" max-vertical-offset="2288">
+          <caret line="61" column="48" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8817204" vertical-offset="234" max-vertical-offset="1122">
+          <caret line="48" column="39" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33215547" vertical-offset="2634" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60183483" vertical-offset="1542" max-vertical-offset="2134">
+          <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
+          <folding>
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#2009#2022#0" expanded="true" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#3855#3868#0" expanded="true" />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43189964" vertical-offset="7173" max-vertical-offset="7876">
+          <caret line="357" column="9" selection-start-line="357" selection-start-column="9" selection-end-line="357" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15591398" vertical-offset="551" max-vertical-offset="2618">
+          <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+          <folding>
+            <element signature="e#909#910#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5322581" vertical-offset="297" max-vertical-offset="3388">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="814">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43369177" vertical-offset="198" max-vertical-offset="2420">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
index 7b491d4..5a7aec8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
@@ -148,6 +148,10 @@
 
     public PgDeviceDto(PgDevice pgDevice) {
 
+        if (pgDevice == null)
+        {
+            return;
+        }
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgDevice.getId()));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index f97c322..5f713f6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -99,4 +99,36 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode)
+    {
+        String[] stringList=assetCode.split("\\.");
+
+        String hql="select * from PG_DEVICE device where device.assetCode like '%"+stringList[1]+"%' and device.assetCode like '%"+stringList[2]+"'";
+
+        List<Object[]> pgDevices=(List<Object[]>)this.getSession().createSQLQuery(hql).list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+
+        for (int i = 0; i<pgDevices.size();i++)
+        {
+            Object[] objects = pgDevices.get(i);
+            PgDeviceDto dto = new PgDeviceDto(null);
+            dto.setId(objects[0].toString());
+            dto.setActive(objects[1].toString());
+            dto.setAssetCode(objects[3].toString());
+            dto.setAssetName(objects[4].toString());
+            dto.setDevCode(objects[5].toString());
+            dto.setDevType(objects[6].toString());
+            dto.setIp(objects[7].toString());
+            dto.setIsOpen(objects[8].toString());
+            dto.setPartition(objects[11].toString());
+            dto.setPipeGallery(objects[12].toString());
+            dto.setPosition(objects[13].toString());
+            dto.setRoad(objects[14].toString());
+
+            pgDeviceDtoList.add(dto);
+        }
+        return pgDeviceDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 279f505..742fa3b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -341,4 +341,32 @@
     }
 
 
+    @POST
+    @Path("getDeviceByOldDAssetCodeCode")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
+
+        try{
+            pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
+            if(pgDeviceDtoList==null)
+                msg="设备信息获取失败";
+            else
+                msg="设备信息获取成功";
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+
+        return resultMap;
+    }
+
+
+
 }

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87198c5..9df45c2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,58 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_001__BR_APPROVAL_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_002__BR_APPROVAL_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_003__BR_APPROVAL_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_004__BR_APPROVAL_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_005__BR_SUPERVISE_WEEKLY_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_006__BR_SUPERVISE_WEEKLY_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_007__BR_SUPERVISE_WEEKLY_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_008__BR_SUPERVISE_WEEKLY_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_009__BR_CONSTRUCTION_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_010__BR_CONSTRUCTION_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_011__BR_CONSTRUCTION_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_012__BR_CONSTRUCTION_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_013__BR_CONSTRUCTION_INFO_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_014__BR_CONSTRUCTION_INFO_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_015__BR_CONSTRUCTION_INFO_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_016__BR_CONSTRUCTION_INFO_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_017__BR_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_018__BR_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_019__BR_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_020__BR_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_021__BR_PROJECT_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_022__BR_PROJECT_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_023__BR_PROJECT_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_024__BR_PROJECT_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_025__BR_PROJECT_PATROL_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_026__BR_PROJECT_PATROL_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_027__BR_PROJECT_PATROL_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_028__BR_PROJECT_PATROL_DATA.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_029__BR_SUPERVISE_CHECK_SEQ.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_030__BR_SUPERVISE_CHECK_TBL.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_031__BR_SUPERVISE_CHECK_TRI.sql" afterPath="" />
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\src\main\resources\orcjb\V0_0_032__BR_SUPERVISE_CHECK_DATA.sql" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" afterPath="$PROJECT_DIR$/管廊数据库设计说明新需求.docx" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/PgInterface.iml" afterPath="$PROJECT_DIR$/PgInterface.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/PgInterface.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/resources/application.properties" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -78,18 +30,7 @@
     <favorites_list name="PgInterface" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PgAlarm.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-              <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
+    <leaf />
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -107,7 +48,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionTypeManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionTypeRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java" />
@@ -145,12 +85,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/spring/DateConverter.java" />
         <option value="$PROJECT_DIR$/src/main/webapp/WEB-INF/web.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
@@ -158,6 +95,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
       </list>
     </option>
   </component>
@@ -218,9 +159,9 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-11" />
-    <option name="y" value="-2" />
-    <option name="width" value="1378" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
     <option name="height" value="744" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
@@ -305,6 +246,28 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="PgInterface" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -369,40 +332,6 @@
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="devTable" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
@@ -952,7 +881,10 @@
       <workItem from="1528333983724" duration="2699000" />
       <workItem from="1528349219682" duration="721000" />
       <workItem from="1528421791812" duration="2287000" />
-      <workItem from="1528771293143" duration="5775000" />
+      <workItem from="1528771293143" duration="9272000" />
+      <workItem from="1528961860313" duration="3105000" />
+      <workItem from="1530094500311" duration="4260000" />
+      <workItem from="1530146280841" duration="2278000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1106,11 +1038,15 @@
       <created>1523494952341</created>
       <updated>1523494952341</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="修改监测设备获取信息字段名称">
+      <created>1528783523876</created>
+      <updated>1528783523876</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="682781000" />
+    <option name="totallyTimeSpent" value="695921000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1133,7 +1069,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-11" y="-2" width="1378" height="744" extended-state="0" />
+    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <editor active="false" />
     <layout>
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1145,7 +1081,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48205128" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44102564" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1158,7 +1094,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23181818" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21676737" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1187,7 +1123,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="按资产表修改设备表" />
     <MESSAGE value="按资产表修改设备表," />
     <MESSAGE value="按资产表修改设备表123" />
     <MESSAGE value="修改新增文件方法 by ym" />
@@ -1212,11 +1147,20 @@
     <MESSAGE value="新增项目状态管理" />
     <MESSAGE value="修改时间检索的格式" />
     <MESSAGE value="新增当天在建工程统计" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增当天在建工程统计" />
+    <MESSAGE value="修改监测设备获取信息字段名称" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改监测设备获取信息字段名称" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="169" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java</url>
+          <line>63</line>
+          <properties />
+          <option name="timeStamp" value="169" />
+        </line-breakpoint>
+      </breakpoints>
+      <option name="time" value="185" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1224,20 +1168,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/domain/PgConstruction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.9422151" vertical-offset="268" max-vertical-offset="1900">
-          <caret line="52" column="70" selection-start-line="52" selection-start-column="70" selection-end-line="52" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1482">
-          <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" />
-        </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 vertical-scroll-proportion="0.0" vertical-offset="413" max-vertical-offset="3477">
@@ -1393,13 +1323,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1282052" vertical-offset="792" max-vertical-offset="2420">
-          <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3229358" vertical-offset="1452" max-vertical-offset="2112">
@@ -1472,13 +1395,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1684" max-vertical-offset="2486">
-          <caret line="159" column="51" selection-start-line="159" selection-start-column="51" selection-end-line="159" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/4.0.6.RELEASE/spring-core-4.0.6.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-3.48" vertical-offset="661" max-vertical-offset="1320">
@@ -1486,49 +1402,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.33333334" vertical-offset="2636" max-vertical-offset="5170">
-          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7172">
-          <caret line="25" column="10" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="10" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="198" max-vertical-offset="3388">
-          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.609319" vertical-offset="122" max-vertical-offset="946">
-          <caret line="48" column="12" selection-start-line="48" selection-start-column="12" selection-end-line="48" selection-end-column="12" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" expanded="false" />
-            <marker date="1528771347258" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="-0.23655914" vertical-offset="330" max-vertical-offset="2310">
           <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1536,15 +1413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.609319" vertical-offset="408" max-vertical-offset="2332">
           <caret line="54" column="59" selection-start-line="54" selection-start-column="59" selection-end-line="54" selection-end-column="59" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.64874554" vertical-offset="408" max-vertical-offset="2288">
-          <caret line="55" column="0" selection-start-line="55" selection-start-column="0" selection-end-line="55" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1552,18 +1420,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.1577061" vertical-offset="1320" max-vertical-offset="2288">
           <caret line="84" column="42" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
-          <folding>
-            <element signature="e#1627#1643#0" expanded="false" />
-            <element signature="e#2741#2757#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="740" max-vertical-offset="1298">
-          <caret line="72" column="36" selection-start-line="72" selection-start-column="36" selection-end-line="72" selection-end-column="36" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1595,14 +1451,106 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.453211" vertical-offset="39" max-vertical-offset="858">
           <caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="672" max-vertical-offset="2288">
+          <caret line="61" column="48" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.8817204" vertical-offset="234" max-vertical-offset="1122">
+          <caret line="48" column="39" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1298">
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgAlarm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78853047" vertical-offset="0" max-vertical-offset="1650">
-          <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="594" max-vertical-offset="1650">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/core/ext/rest/RestFilter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.33215547" vertical-offset="2634" max-vertical-offset="5170">
+          <caret line="141" column="0" selection-start-line="141" selection-start-column="0" selection-end-line="141" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.60183483" vertical-offset="1542" max-vertical-offset="2134">
+          <caret line="127" column="0" selection-start-line="127" selection-start-column="0" selection-end-line="127" selection-end-column="0" />
+          <folding>
+            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#2009#2022#0" expanded="true" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
+            <element signature="e#3855#3868#0" expanded="true" />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43189964" vertical-offset="7173" max-vertical-offset="7876">
+          <caret line="357" column="9" selection-start-line="357" selection-start-column="9" selection-end-line="357" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.15591398" vertical-offset="551" max-vertical-offset="2618">
+          <caret line="36" column="18" selection-start-line="36" selection-start-column="18" selection-end-line="36" selection-end-column="18" />
+          <folding>
+            <element signature="e#909#910#0" expanded="true" />
+            <element signature="e#941#942#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5322581" vertical-offset="297" max-vertical-offset="3388">
+          <caret line="31" column="28" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="77" max-vertical-offset="814">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43369177" vertical-offset="198" max-vertical-offset="2420">
+          <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
index 7b491d4..5a7aec8 100644
--- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
+++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java
@@ -148,6 +148,10 @@
 
     public PgDeviceDto(PgDevice pgDevice) {
 
+        if (pgDevice == null)
+        {
+            return;
+        }
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
 
         this.setId(String.valueOf(pgDevice.getId()));
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index f97c322..5f713f6 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -99,4 +99,36 @@
         return pgDeviceDtoList;
     }
 
+    public List<PgDeviceDto> getDeviceByOldDAssetCodeCode(String assetCode)
+    {
+        String[] stringList=assetCode.split("\\.");
+
+        String hql="select * from PG_DEVICE device where device.assetCode like '%"+stringList[1]+"%' and device.assetCode like '%"+stringList[2]+"'";
+
+        List<Object[]> pgDevices=(List<Object[]>)this.getSession().createSQLQuery(hql).list();
+
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+
+        for (int i = 0; i<pgDevices.size();i++)
+        {
+            Object[] objects = pgDevices.get(i);
+            PgDeviceDto dto = new PgDeviceDto(null);
+            dto.setId(objects[0].toString());
+            dto.setActive(objects[1].toString());
+            dto.setAssetCode(objects[3].toString());
+            dto.setAssetName(objects[4].toString());
+            dto.setDevCode(objects[5].toString());
+            dto.setDevType(objects[6].toString());
+            dto.setIp(objects[7].toString());
+            dto.setIsOpen(objects[8].toString());
+            dto.setPartition(objects[11].toString());
+            dto.setPipeGallery(objects[12].toString());
+            dto.setPosition(objects[13].toString());
+            dto.setRoad(objects[14].toString());
+
+            pgDeviceDtoList.add(dto);
+        }
+        return pgDeviceDtoList;
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 279f505..742fa3b 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -341,4 +341,32 @@
     }
 
 
+    @POST
+    @Path("getDeviceByOldDAssetCodeCode")
+    @Produces(MediaType.APPLICATION_JSON)
+    public Map<String,Object> getDeviceByOldDAssetCodeCode(@FormParam("assetCode") String assetCode) throws Exception{
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        String msg="";
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
+
+        try{
+            pgDeviceDtoList=pgDeviceManager.getDeviceByOldDAssetCodeCode(assetCode);
+            if(pgDeviceDtoList==null)
+                msg="设备信息获取失败";
+            else
+                msg="设备信息获取成功";
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+            msg="设备信息获取失败";
+        }
+        resultMap.put("msg",msg);
+        resultMap.put("result",pgDeviceDtoList);
+
+        return resultMap;
+    }
+
+
+
 }
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 d3f41ad..0987d90 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