diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
index 28f8704..e67a3cb 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -58,7 +58,7 @@
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
         try {
-            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCoList.get(0);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
index 28f8704..e67a3cb 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -58,7 +58,7 @@
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
         try {
-            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCoList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
index 7c6b3de..b4445b2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -59,7 +59,7 @@
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgO2List.get(0);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
index 28f8704..e67a3cb 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -58,7 +58,7 @@
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
         try {
-            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCoList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
index 7c6b3de..b4445b2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -59,7 +59,7 @@
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgO2List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
index 478d8d2..7b3d114 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -58,7 +58,7 @@
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
+            String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgShList.get(0);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
index 28f8704..e67a3cb 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -58,7 +58,7 @@
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
         try {
-            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCoList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
index 7c6b3de..b4445b2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -59,7 +59,7 @@
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgO2List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
index 478d8d2..7b3d114 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -58,7 +58,7 @@
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
+            String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgShList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
index 585db00..1cbc193 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
@@ -60,7 +60,7 @@
     public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_TEMPHUM where rownum < 2 order by UPTIME";
+            String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND  rownum < 2 order by UPTIME";
 
             List<Object[]> pgTempHumList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgTempHumList.get(0);

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec01dab..a8b1f90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="DELETED" beforePath="D:\PipeGallery\PgInterface\~$口说明新需求.docx" afterPath="" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/接口说明新需求.docx" afterPath="$PROJECT_DIR$/接口说明新需求.docx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
@@ -35,12 +33,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgTempHumDto.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+      <file leaf-file-name="PgCh4Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-              <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-              <folding />
+            <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+              <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
+              <folding>
+                <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+                <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgCoManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+                <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgO2Manager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+              <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+                <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgShManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+              <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+              <folding>
+                <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+                <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="PgTempHumManager.java" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+              <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+              <folding>
+                <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+                <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,11 +163,11 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java" />
       </list>
     </option>
@@ -489,44 +544,6 @@
               <option name="myItemId" value="devData" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dto" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="PgInterface" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="devData" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="domain" />
-              <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
@@ -1066,7 +1083,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="32506000" />
+      <workItem from="1530760861055" duration="36986000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1236,11 +1253,15 @@
       <created>1531108933085</created>
       <updated>1531108933085</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="修改设备检测值获取方法">
+      <created>1531193513894</created>
+      <updated>1531193513894</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="730786000" />
+    <option name="totallyTimeSpent" value="735266000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1289,7 +1310,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32649574" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26283988" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23111783" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
@@ -1317,7 +1338,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
     <MESSAGE value="完成入廊人员管理接口" />
@@ -1342,7 +1362,8 @@
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
     <MESSAGE value="新增获取设备最新数据接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
+    <MESSAGE value="修改设备检测值获取方法" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改设备检测值获取方法" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1354,70 +1375,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1577061" vertical-offset="66" max-vertical-offset="836">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.68458784" vertical-offset="1290" max-vertical-offset="1848">
-          <caret line="119" column="5" selection-start-line="119" selection-start-column="5" selection-end-line="119" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.1827957" vertical-offset="256" max-vertical-offset="814">
-          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeStatisticDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="550">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.27598566" vertical-offset="0" max-vertical-offset="1848">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.60573477" vertical-offset="1356" max-vertical-offset="1980">
-          <caret line="124" column="51" selection-start-line="124" selection-start-column="51" selection-end-line="124" selection-end-column="51" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.734767" vertical-offset="564" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.039426524" vertical-offset="132" max-vertical-offset="1122">
-          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="880">
@@ -1703,23 +1660,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.1971326" vertical-offset="58" max-vertical-offset="1672">
-          <caret line="78" column="7" selection-start-line="78" selection-start-column="7" selection-end-line="78" selection-end-column="7" />
-          <folding>
-            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#1630#1646#0" expanded="true" />
-            <element signature="e#1722#1732#0" expanded="true" />
-            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#2637#2653#0" expanded="true" />
-            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-            <element signature="e#3348#3353#0" expanded="false" />
-            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
@@ -1736,16 +1676,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
-          <caret line="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
-          <folding>
-            <marker date="1531192103092" expanded="true" signature="-1:-1" placeholder="select * fro..PG_O2..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
@@ -1754,16 +1684,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="11" selection-end-line="72" selection-end-column="27" />
-          <folding>
-            <marker date="1531192165844" expanded="true" signature="-1:-1" placeholder="select * fro..PG_Sh..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5645161" vertical-offset="15" max-vertical-offset="1320">
@@ -1772,42 +1692,156 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.80615383" vertical-offset="1036" max-vertical-offset="1694">
-          <caret line="72" column="59" selection-start-line="72" selection-start-column="59" selection-end-line="72" selection-end-column="59" />
+        <state vertical-scroll-proportion="0.76344085" vertical-offset="1026" max-vertical-offset="1584">
+          <caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.43486238" vertical-offset="115" max-vertical-offset="1276">
+          <caret line="18" column="46" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="46" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgStatus.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="39" max-vertical-offset="1034">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPartition.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6954128" vertical-offset="105" max-vertical-offset="2112">
+          <caret line="27" column="34" selection-start-line="27" selection-start-column="30" selection-end-line="27" selection-end-column="34" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgStatusManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5743119" vertical-offset="677" max-vertical-offset="2112">
+          <caret line="57" column="56" selection-start-line="57" selection-start-column="56" selection-end-line="57" selection-end-column="56" />
           <folding>
-            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..PgInPgStatus..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select count..pg_inpg_status..." />
+            <marker date="1528080563100" expanded="true" signature="-1:-1" placeholder="select * fro..PgInPgStatus..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.2430769" vertical-offset="894" max-vertical-offset="1650">
-          <caret line="72" column="27" selection-start-line="60" selection-start-column="12" selection-end-line="72" selection-end-column="27" />
+        <state vertical-scroll-proportion="0.41153845" vertical-offset="864" max-vertical-offset="7084">
+          <caret line="72" column="50" selection-start-line="72" selection-start-column="40" selection-end-line="72" selection-end-column="61" />
           <folding>
-            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+            <element signature="docComment;method#getMonthInPgPersonNum#0;class#PgOverViewRs#0" expanded="false" />
+            <element signature="e#2056#2072#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.29080674" vertical-offset="4201" max-vertical-offset="5434">
+          <caret line="216" column="53" selection-start-line="216" selection-start-column="53" selection-end-line="216" selection-end-column="53" />
+          <folding>
+            <element signature="method#setPgInPgPersonManager#0;class#PgInPgPersonRs#0" expanded="false" />
+            <element signature="method#setPgInPgStatusManager#0;class#PgInPgPersonRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PipeGallery.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.80733943" vertical-offset="88" max-vertical-offset="1320">
+          <caret line="33" column="5" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/domain/PgPipeLine.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="220" max-vertical-offset="1804">
+          <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.6702509" vertical-offset="594" max-vertical-offset="1672">
+          <caret line="89" column="59" selection-start-line="89" selection-start-column="59" selection-end-line="89" selection-end-column="59" />
+          <folding>
+            <element signature="method#getCh4InfoByDevAndDate#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#getNewestCh4InfoByDev#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="docComment;method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
+            <element signature="e#3348#3353#0" expanded="false" />
+            <element signature="method#addCh4Data#0;class#PgCh4Rs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.092307694" vertical-offset="300" max-vertical-offset="1034">
-          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="168" max-vertical-offset="1034">
+          <caret line="63" column="91" selection-start-line="63" selection-start-column="51" selection-end-line="63" selection-end-column="91" />
           <folding>
             <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2054" placeholder="select * fro..PG_CH4..." />
+            <marker date="1531218742532" expanded="true" signature="2015:2108" placeholder="select * fro..PG_CH4..." />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6308244" vertical-offset="0" max-vertical-offset="1584">
-          <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
-          <folding />
+        <state vertical-scroll-proportion="0.0" vertical-offset="894" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218945601" expanded="true" signature="1939:1979" placeholder="select * fro..PG_CO..." />
+            <marker date="1531218945601" expanded="true" signature="1939:2031" placeholder="select * fro..PG_CO..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="872" max-vertical-offset="1672">
+          <caret line="62" column="0" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <marker date="1531218967497" expanded="true" signature="1940:1980" placeholder="select * fro..PG_O2..." />
+            <marker date="1531218967497" expanded="true" signature="1940:2032" placeholder="select * fro..PG_O2..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="806" max-vertical-offset="1650">
+          <caret line="61" column="0" selection-start-line="61" selection-start-column="0" selection-end-line="61" selection-end-column="0" />
+          <folding>
+            <marker date="1531218975496" expanded="true" signature="1939:1979" placeholder="select * fro..PG_Sh..." />
+            <marker date="1531218975496" expanded="true" signature="1939:2031" placeholder="select * fro..PG_Sh..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5483871" vertical-offset="706" max-vertical-offset="1694">
+          <caret line="59" column="61" selection-start-line="59" selection-start-column="61" selection-end-line="59" selection-end-column="61" />
+          <folding>
+            <marker date="1531218986086" expanded="true" signature="2046:2091" placeholder="select * fro..PG_TEMPHUM..." />
+            <marker date="1531218986086" expanded="true" signature="2046:2144" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
index 7a338ad..8b3f7ee 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -61,7 +61,7 @@
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCh4List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
index 28f8704..e67a3cb 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -58,7 +58,7 @@
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
         try {
-            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
+            String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgCoList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
index 7c6b3de..b4445b2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -59,7 +59,7 @@
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
+            String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgO2List.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
index 478d8d2..7b3d114 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -58,7 +58,7 @@
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
+            String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME";
 
             List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgShList.get(0);
diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
index 585db00..1cbc193 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
@@ -60,7 +60,7 @@
     public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) {
 
         try {
-            String sql="select * from PG_TEMPHUM where rownum < 2 order by UPTIME";
+            String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND  rownum < 2 order by UPTIME";
 
             List<Object[]> pgTempHumList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
             Object[] objects = pgTempHumList.get(0);
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 4da8803..b66385b 100644
--- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
Binary files differ