diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de0c6a0..a53145d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/接口说明20190726.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190726.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20190527.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,46 +26,50 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="85" />
-          <entry key="properties" value="3" />
+          <entry key="java" value="92" />
+          <entry key="properties" value="5" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="85" />
-          <entry key="Properties" value="3" />
+          <entry key="JAVA" value="92" />
+          <entry key="Properties" value="5" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="6089" />
-          <entry key="properties" value="5" />
+          <entry key="java" value="6152" />
+          <entry key="properties" value="49" />
+          <entry key="txt" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="6089" />
-          <entry key="Properties" value="5" />
+          <entry key="JAVA" value="6152" />
+          <entry key="PLAIN_TEXT" value="16" />
+          <entry key="Properties" value="49" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.1" value="3" />
           <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.3" value="3" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
-          <entry key="project.open.time.41" value="1" />
+          <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.59" value="1" />
           <entry key="project.open.time.71" value="1" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="19" />
         </counts>
       </usages-collector>
     </session>
@@ -106,6 +91,7 @@
       <find>compositeFilter</find>
       <find>alarmTypeId</find>
       <find>getPipeGalleryByPgName</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,7 +111,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
@@ -143,6 +128,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -178,15 +164,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
-    <option name="width" value="973" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,12 +209,17 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -233,7 +227,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38850576" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -349,17 +343,31 @@
       <workItem from="1563781880751" duration="5265000" />
       <workItem from="1563843453180" duration="634000" />
       <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="3889000" />
+      <workItem from="1564124503548" duration="4416000" />
+      <workItem from="1564448538977" duration="3857000" />
+      <workItem from="1564455098062" duration="2354000" />
+      <workItem from="1566095731601" duration="5201000" />
+      <workItem from="1566176164703" duration="807000" />
+      <workItem from="1566182732032" duration="410000" />
+      <workItem from="1566205202678" duration="7779000" />
     </task>
+    <task id="LOCAL-00001" summary="修改无数据提示信息">
+      <created>1564361618083</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1564361618083</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78487000" />
+    <option name="totallyTimeSpent" value="99422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19894099" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24130106" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -370,7 +378,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.6" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.652459" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -437,6 +445,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="修改无数据提示信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改无数据提示信息" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -570,13 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="67" column="21" lean-forward="true" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
@@ -598,13 +603,6 @@
         </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 relative-caret-position="484">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -784,21 +782,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="92" column="13" selection-start-line="92" selection-start-column="13" selection-end-line="92" selection-end-column="13" />
+        </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 relative-caret-position="516">
+          <caret line="216" selection-start-line="216" selection-end-line="216" />
+        </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 relative-caret-position="296">
+          <caret line="360" column="61" selection-start-line="360" selection-start-column="61" selection-end-line="360" selection-end-column="61" />
           <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2389#2390#0" expanded="true" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
           </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 relative-caret-position="362">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="40">
+          <caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
           <folding>
             <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
             <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
             <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
@@ -807,23 +826,8 @@
         </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 relative-caret-position="315">
-          <caret line="360" column="62" lean-forward="true" selection-start-line="360" selection-start-column="62" selection-end-line="360" selection-end-column="62" />
-          <folding>
-            <element signature="e#1130#1135#0" />
-            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
-            <element signature="e#1991#1996#0" />
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
   <component name="masterDetails">

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de0c6a0..a53145d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/接口说明20190726.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190726.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20190527.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,46 +26,50 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="85" />
-          <entry key="properties" value="3" />
+          <entry key="java" value="92" />
+          <entry key="properties" value="5" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="85" />
-          <entry key="Properties" value="3" />
+          <entry key="JAVA" value="92" />
+          <entry key="Properties" value="5" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="6089" />
-          <entry key="properties" value="5" />
+          <entry key="java" value="6152" />
+          <entry key="properties" value="49" />
+          <entry key="txt" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="6089" />
-          <entry key="Properties" value="5" />
+          <entry key="JAVA" value="6152" />
+          <entry key="PLAIN_TEXT" value="16" />
+          <entry key="Properties" value="49" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.1" value="3" />
           <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.3" value="3" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
-          <entry key="project.open.time.41" value="1" />
+          <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.59" value="1" />
           <entry key="project.open.time.71" value="1" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="19" />
         </counts>
       </usages-collector>
     </session>
@@ -106,6 +91,7 @@
       <find>compositeFilter</find>
       <find>alarmTypeId</find>
       <find>getPipeGalleryByPgName</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,7 +111,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
@@ -143,6 +128,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -178,15 +164,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
-    <option name="width" value="973" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,12 +209,17 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -233,7 +227,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38850576" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -349,17 +343,31 @@
       <workItem from="1563781880751" duration="5265000" />
       <workItem from="1563843453180" duration="634000" />
       <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="3889000" />
+      <workItem from="1564124503548" duration="4416000" />
+      <workItem from="1564448538977" duration="3857000" />
+      <workItem from="1564455098062" duration="2354000" />
+      <workItem from="1566095731601" duration="5201000" />
+      <workItem from="1566176164703" duration="807000" />
+      <workItem from="1566182732032" duration="410000" />
+      <workItem from="1566205202678" duration="7779000" />
     </task>
+    <task id="LOCAL-00001" summary="修改无数据提示信息">
+      <created>1564361618083</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1564361618083</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78487000" />
+    <option name="totallyTimeSpent" value="99422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19894099" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24130106" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -370,7 +378,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.6" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.652459" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -437,6 +445,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="修改无数据提示信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改无数据提示信息" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -570,13 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="67" column="21" lean-forward="true" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
@@ -598,13 +603,6 @@
         </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 relative-caret-position="484">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -784,21 +782,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="92" column="13" selection-start-line="92" selection-start-column="13" selection-end-line="92" selection-end-column="13" />
+        </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 relative-caret-position="516">
+          <caret line="216" selection-start-line="216" selection-end-line="216" />
+        </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 relative-caret-position="296">
+          <caret line="360" column="61" selection-start-line="360" selection-start-column="61" selection-end-line="360" selection-end-column="61" />
           <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2389#2390#0" expanded="true" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
           </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 relative-caret-position="362">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="40">
+          <caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
           <folding>
             <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
             <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
             <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
@@ -807,23 +826,8 @@
         </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 relative-caret-position="315">
-          <caret line="360" column="62" lean-forward="true" selection-start-line="360" selection-start-column="62" selection-end-line="360" selection-end-column="62" />
-          <folding>
-            <element signature="e#1130#1135#0" />
-            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
-            <element signature="e#1991#1996#0" />
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
   <component name="masterDetails">
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 493bf06..43a8e7a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -60,7 +60,7 @@
         criteria.add(Restrictions.eq("devType",devType));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
@@ -164,6 +164,7 @@
             dto.setAssetName(objects[4].toString());
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
+            if(objects[7]!=null)
             dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de0c6a0..a53145d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/接口说明20190726.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190726.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20190527.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,46 +26,50 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="85" />
-          <entry key="properties" value="3" />
+          <entry key="java" value="92" />
+          <entry key="properties" value="5" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="85" />
-          <entry key="Properties" value="3" />
+          <entry key="JAVA" value="92" />
+          <entry key="Properties" value="5" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="6089" />
-          <entry key="properties" value="5" />
+          <entry key="java" value="6152" />
+          <entry key="properties" value="49" />
+          <entry key="txt" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="6089" />
-          <entry key="Properties" value="5" />
+          <entry key="JAVA" value="6152" />
+          <entry key="PLAIN_TEXT" value="16" />
+          <entry key="Properties" value="49" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.1" value="3" />
           <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.3" value="3" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
-          <entry key="project.open.time.41" value="1" />
+          <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.59" value="1" />
           <entry key="project.open.time.71" value="1" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="19" />
         </counts>
       </usages-collector>
     </session>
@@ -106,6 +91,7 @@
       <find>compositeFilter</find>
       <find>alarmTypeId</find>
       <find>getPipeGalleryByPgName</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,7 +111,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
@@ -143,6 +128,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -178,15 +164,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
-    <option name="width" value="973" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,12 +209,17 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -233,7 +227,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38850576" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -349,17 +343,31 @@
       <workItem from="1563781880751" duration="5265000" />
       <workItem from="1563843453180" duration="634000" />
       <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="3889000" />
+      <workItem from="1564124503548" duration="4416000" />
+      <workItem from="1564448538977" duration="3857000" />
+      <workItem from="1564455098062" duration="2354000" />
+      <workItem from="1566095731601" duration="5201000" />
+      <workItem from="1566176164703" duration="807000" />
+      <workItem from="1566182732032" duration="410000" />
+      <workItem from="1566205202678" duration="7779000" />
     </task>
+    <task id="LOCAL-00001" summary="修改无数据提示信息">
+      <created>1564361618083</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1564361618083</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78487000" />
+    <option name="totallyTimeSpent" value="99422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19894099" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24130106" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -370,7 +378,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.6" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.652459" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -437,6 +445,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="修改无数据提示信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改无数据提示信息" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -570,13 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="67" column="21" lean-forward="true" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
@@ -598,13 +603,6 @@
         </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 relative-caret-position="484">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -784,21 +782,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="92" column="13" selection-start-line="92" selection-start-column="13" selection-end-line="92" selection-end-column="13" />
+        </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 relative-caret-position="516">
+          <caret line="216" selection-start-line="216" selection-end-line="216" />
+        </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 relative-caret-position="296">
+          <caret line="360" column="61" selection-start-line="360" selection-start-column="61" selection-end-line="360" selection-end-column="61" />
           <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2389#2390#0" expanded="true" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
           </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 relative-caret-position="362">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="40">
+          <caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
           <folding>
             <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
             <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
             <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
@@ -807,23 +826,8 @@
         </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 relative-caret-position="315">
-          <caret line="360" column="62" lean-forward="true" selection-start-line="360" selection-start-column="62" selection-end-line="360" selection-end-column="62" />
-          <folding>
-            <element signature="e#1130#1135#0" />
-            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
-            <element signature="e#1991#1996#0" />
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
   <component name="masterDetails">
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 493bf06..43a8e7a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -60,7 +60,7 @@
         criteria.add(Restrictions.eq("devType",devType));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
@@ -164,6 +164,7 @@
             dto.setAssetName(objects[4].toString());
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
+            if(objects[7]!=null)
             dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 7ce1ada..a18bb85 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -39,9 +39,9 @@
     @Path("getPgDeviceByDevType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
@@ -372,6 +372,7 @@
         {
             e.printStackTrace();
             msg="设备信息获取失败";
+            resultMap.put("result",null);
         }
         resultMap.put("msg",msg);
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de0c6a0..a53145d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/接口说明20190726.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190726.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20190527.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,46 +26,50 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="85" />
-          <entry key="properties" value="3" />
+          <entry key="java" value="92" />
+          <entry key="properties" value="5" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="85" />
-          <entry key="Properties" value="3" />
+          <entry key="JAVA" value="92" />
+          <entry key="Properties" value="5" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="6089" />
-          <entry key="properties" value="5" />
+          <entry key="java" value="6152" />
+          <entry key="properties" value="49" />
+          <entry key="txt" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="6089" />
-          <entry key="Properties" value="5" />
+          <entry key="JAVA" value="6152" />
+          <entry key="PLAIN_TEXT" value="16" />
+          <entry key="Properties" value="49" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.1" value="3" />
           <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.3" value="3" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
-          <entry key="project.open.time.41" value="1" />
+          <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.59" value="1" />
           <entry key="project.open.time.71" value="1" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="19" />
         </counts>
       </usages-collector>
     </session>
@@ -106,6 +91,7 @@
       <find>compositeFilter</find>
       <find>alarmTypeId</find>
       <find>getPipeGalleryByPgName</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,7 +111,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
@@ -143,6 +128,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -178,15 +164,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
-    <option name="width" value="973" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,12 +209,17 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -233,7 +227,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38850576" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -349,17 +343,31 @@
       <workItem from="1563781880751" duration="5265000" />
       <workItem from="1563843453180" duration="634000" />
       <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="3889000" />
+      <workItem from="1564124503548" duration="4416000" />
+      <workItem from="1564448538977" duration="3857000" />
+      <workItem from="1564455098062" duration="2354000" />
+      <workItem from="1566095731601" duration="5201000" />
+      <workItem from="1566176164703" duration="807000" />
+      <workItem from="1566182732032" duration="410000" />
+      <workItem from="1566205202678" duration="7779000" />
     </task>
+    <task id="LOCAL-00001" summary="修改无数据提示信息">
+      <created>1564361618083</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1564361618083</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78487000" />
+    <option name="totallyTimeSpent" value="99422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19894099" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24130106" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -370,7 +378,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.6" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.652459" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -437,6 +445,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="修改无数据提示信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改无数据提示信息" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -570,13 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="67" column="21" lean-forward="true" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
@@ -598,13 +603,6 @@
         </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 relative-caret-position="484">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -784,21 +782,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="92" column="13" selection-start-line="92" selection-start-column="13" selection-end-line="92" selection-end-column="13" />
+        </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 relative-caret-position="516">
+          <caret line="216" selection-start-line="216" selection-end-line="216" />
+        </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 relative-caret-position="296">
+          <caret line="360" column="61" selection-start-line="360" selection-start-column="61" selection-end-line="360" selection-end-column="61" />
           <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2389#2390#0" expanded="true" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
           </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 relative-caret-position="362">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="40">
+          <caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
           <folding>
             <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
             <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
             <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
@@ -807,23 +826,8 @@
         </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 relative-caret-position="315">
-          <caret line="360" column="62" lean-forward="true" selection-start-line="360" selection-start-column="62" selection-end-line="360" selection-end-column="62" />
-          <folding>
-            <element signature="e#1130#1135#0" />
-            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
-            <element signature="e#1991#1996#0" />
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
   <component name="masterDetails">
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 493bf06..43a8e7a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -60,7 +60,7 @@
         criteria.add(Restrictions.eq("devType",devType));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
@@ -164,6 +164,7 @@
             dto.setAssetName(objects[4].toString());
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
+            if(objects[7]!=null)
             dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 7ce1ada..a18bb85 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -39,9 +39,9 @@
     @Path("getPgDeviceByDevType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
@@ -372,6 +372,7 @@
         {
             e.printStackTrace();
             msg="设备信息获取失败";
+            resultMap.put("result",null);
         }
         resultMap.put("msg",msg);
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5b54f01..cc83f4a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,3 @@
-
-
 # ============================================================================
 # application
 # ============================================================================
@@ -16,8 +14,8 @@
 # db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
 db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
 db.default.username=PG
 db.default.password=PG
 

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de0c6a0..a53145d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,30 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ac3e85f3-13b5-472b-b1fe-97aa41c98222" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgIntelPlan.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgIntelPlanTypeDto.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgIntelPlanManager.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgIntelPlanRs.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$数据库设计说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/~$说明20190612.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/接口说明20190726.docx" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/管廊数据库设计说明20190612.docx" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/~$说明20190726.docx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgPipeLineManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPipeLineRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PipeGalleryRs.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/接口说明20190527.docx" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/管廊数据库设计说明20190522.docx" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/../out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -45,46 +26,50 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="1" />
-          <entry key="java" value="85" />
-          <entry key="properties" value="3" />
+          <entry key="java" value="92" />
+          <entry key="properties" value="5" />
           <entry key="xml" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="85" />
-          <entry key="Properties" value="3" />
+          <entry key="JAVA" value="92" />
+          <entry key="Properties" value="5" />
           <entry key="XML" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="6089" />
-          <entry key="properties" value="5" />
+          <entry key="java" value="6152" />
+          <entry key="properties" value="49" />
+          <entry key="txt" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="6089" />
-          <entry key="Properties" value="5" />
+          <entry key="JAVA" value="6152" />
+          <entry key="PLAIN_TEXT" value="16" />
+          <entry key="Properties" value="49" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.1" value="2" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.1" value="3" />
           <entry key="project.open.time.2" value="1" />
+          <entry key="project.open.time.20" value="1" />
+          <entry key="project.open.time.3" value="3" />
           <entry key="project.open.time.4" value="1" />
           <entry key="project.open.time.40" value="1" />
-          <entry key="project.open.time.41" value="1" />
+          <entry key="project.open.time.41" value="2" />
           <entry key="project.open.time.42" value="1" />
           <entry key="project.open.time.45" value="2" />
           <entry key="project.open.time.48" value="1" />
           <entry key="project.open.time.59" value="1" />
           <entry key="project.open.time.71" value="1" />
           <entry key="project.open.time.76" value="1" />
-          <entry key="project.opened" value="13" />
+          <entry key="project.opened" value="19" />
         </counts>
       </usages-collector>
     </session>
@@ -106,6 +91,7 @@
       <find>compositeFilter</find>
       <find>alarmTypeId</find>
       <find>getPipeGalleryByPgName</find>
+      <find>getPgDeviceByDevType</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -125,7 +111,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PipeGalleryManager.java" />
@@ -143,6 +128,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
       </list>
     </option>
   </component>
@@ -178,15 +164,18 @@
     </treeState>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-5" />
-    <option name="width" value="973" />
-    <option name="height" value="728" />
+    <option name="x" value="-8" />
+    <option name="y" value="-8" />
+    <option name="width" value="1382" />
+    <option name="height" value="744" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -220,12 +209,17 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="PgInterface" type="b2602c69:ProjectViewProjectNode" />
+              <item name="PgInterface" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="webapp" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="AndroidView" />
     </panes>
   </component>
@@ -233,7 +227,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1560334254105" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.38850576" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
@@ -349,17 +343,31 @@
       <workItem from="1563781880751" duration="5265000" />
       <workItem from="1563843453180" duration="634000" />
       <workItem from="1564119281986" duration="2507000" />
-      <workItem from="1564124503548" duration="3889000" />
+      <workItem from="1564124503548" duration="4416000" />
+      <workItem from="1564448538977" duration="3857000" />
+      <workItem from="1564455098062" duration="2354000" />
+      <workItem from="1566095731601" duration="5201000" />
+      <workItem from="1566176164703" duration="807000" />
+      <workItem from="1566182732032" duration="410000" />
+      <workItem from="1566205202678" duration="7779000" />
     </task>
+    <task id="LOCAL-00001" summary="修改无数据提示信息">
+      <created>1564361618083</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1564361618083</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78487000" />
+    <option name="totallyTimeSpent" value="99422000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19894099" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24130106" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -370,7 +378,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.6" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49924356" weight="0.652459" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -437,6 +445,10 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="修改无数据提示信息" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改无数据提示信息" />
+  </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
@@ -570,13 +582,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="67" column="21" lean-forward="true" selection-start-line="67" selection-start-column="21" selection-end-line="67" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="484">
@@ -598,13 +603,6 @@
         </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 relative-caret-position="484">
-          <caret line="26" column="38" lean-forward="true" selection-start-line="26" selection-start-column="38" selection-end-line="26" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryStatic.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
@@ -784,21 +782,42 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
           <caret line="92" column="13" selection-start-line="92" selection-start-column="13" selection-end-line="92" selection-end-column="13" />
+        </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 relative-caret-position="516">
+          <caret line="216" selection-start-line="216" selection-end-line="216" />
+        </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 relative-caret-position="296">
+          <caret line="360" column="61" selection-start-line="360" selection-start-column="61" selection-end-line="360" selection-end-column="61" />
           <folding>
-            <element signature="e#2336#2337#0" expanded="true" />
-            <element signature="e#2389#2390#0" expanded="true" />
+            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
+            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
+            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
+            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByDevCode#0;class#PgDeviceRs#0" />
+            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
           </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 relative-caret-position="362">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="40">
+          <caret line="82" column="18" lean-forward="true" selection-start-line="82" selection-start-column="18" selection-end-line="82" selection-end-column="18" />
           <folding>
             <element signature="method#getAllDevice#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByAssetCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceByDevTypee#0;class#PgDeviceManager#0" />
+            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" />
             <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" />
             <element signature="method#getPgDeviceDtoListByPartition#0;class#PgDeviceManager#0" />
             <element signature="method#getPgCameraListByPartition#0;class#PgDeviceManager#0" />
@@ -807,23 +826,8 @@
         </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 relative-caret-position="315">
-          <caret line="360" column="62" lean-forward="true" selection-start-line="360" selection-start-column="62" selection-end-line="360" selection-end-column="62" />
-          <folding>
-            <element signature="e#1130#1135#0" />
-            <element signature="method#getPgDeviceByDevType#0;class#PgDeviceRs#0" />
-            <element signature="e#1991#1996#0" />
-            <element signature="method#getPgDeviceByAssetCode#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceList#0;class#PgDeviceRs#0" />
-            <element signature="method#addDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#editPartition#0;class#PgDeviceRs#0" />
-            <element signature="method#deleteDevice#0;class#PgDeviceRs#0" />
-            <element signature="method#getDeviceByPartition#0;class#PgDeviceRs#0" />
-          </folding>
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
   </component>
   <component name="masterDetails">
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 493bf06..43a8e7a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -60,7 +60,7 @@
         criteria.add(Restrictions.eq("devType",devType));
 
         List<PgDevice> pgDeviceList=criteria.list();
-        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList = new ArrayList<>();
 
         for (PgDevice pgDevice : pgDeviceList) {
             pgDeviceDtoList.add(new PgDeviceDto(pgDevice));
@@ -164,6 +164,7 @@
             dto.setAssetName(objects[4].toString());
             dto.setDevCode(objects[5].toString());
             dto.setDevType(objects[6].toString());
+            if(objects[7]!=null)
             dto.setIp(objects[7].toString());
             dto.setIsOpen(objects[8].toString());
             dto.setPartition(objects[11].toString());
diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
index 7ce1ada..a18bb85 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java
@@ -39,9 +39,9 @@
     @Path("getPgDeviceByDevType")
     @Produces(MediaType.APPLICATION_JSON)
     public Map<String, Object> getPgDeviceByDevType(@FormParam("devType") String devType) throws Exception {
-        Map<String, Object> resultMap = new HashMap<String, Object>();
+        Map<String, Object> resultMap = new HashMap<>();
         String msg = "";
-        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<PgDeviceDto>();
+        List<PgDeviceDto> pgDeviceDtoList=new ArrayList<>();
         try {
             pgDeviceDtoList = pgDeviceManager.getDeviceByDevTypee(devType);
             if(pgDeviceDtoList==null||pgDeviceDtoList.size()==0){
@@ -372,6 +372,7 @@
         {
             e.printStackTrace();
             msg="设备信息获取失败";
+            resultMap.put("result",null);
         }
         resultMap.put("msg",msg);
 
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5b54f01..cc83f4a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,3 @@
-
-
 # ============================================================================
 # application
 # ============================================================================
@@ -16,8 +14,8 @@
 # db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
+#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
 db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
 db.default.username=PG
 db.default.password=PG
 
diff --git "a/~$\350\257\264\346\230\21620190726.docx" "b/~$\350\257\264\346\230\21620190726.docx"
new file mode 100644
index 0000000..78a896a
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190726.docx"
Binary files differ