diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {
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 be64bad..7c6b3de 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -58,21 +58,20 @@
     //获取设备最新数据
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
-        List<PgO2Dto> pgO2DtoList=new ArrayList<PgO2Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgO2.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
 
-            List<PgO2> pgO2List = criteria.list();
-            if (pgO2List.size() == 0)
-                return null;
-            else {
-                PgO2 pgO2 = pgO2List.get(0);
-                return new PgO2Dto(pgO2);
-            }
+            List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgO2List.get(0);
+            PgO2Dto pgO2Dto=new PgO2Dto(null);
+            pgO2Dto.setId(objects[0].toString());
+            pgO2Dto.setValue(objects[1].toString());
+            pgO2Dto.setLogTime(objects[2].toString());
+            pgO2Dto.setUpTime(objects[3].toString());
+            pgO2Dto.setDevCode(pgDevice.getDevCode());
+            pgO2Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgO2Dto;
         }
         catch(Exception ex)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {
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 be64bad..7c6b3de 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -58,21 +58,20 @@
     //获取设备最新数据
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
-        List<PgO2Dto> pgO2DtoList=new ArrayList<PgO2Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgO2.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
 
-            List<PgO2> pgO2List = criteria.list();
-            if (pgO2List.size() == 0)
-                return null;
-            else {
-                PgO2 pgO2 = pgO2List.get(0);
-                return new PgO2Dto(pgO2);
-            }
+            List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgO2List.get(0);
+            PgO2Dto pgO2Dto=new PgO2Dto(null);
+            pgO2Dto.setId(objects[0].toString());
+            pgO2Dto.setValue(objects[1].toString());
+            pgO2Dto.setLogTime(objects[2].toString());
+            pgO2Dto.setUpTime(objects[3].toString());
+            pgO2Dto.setDevCode(pgDevice.getDevCode());
+            pgO2Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgO2Dto;
         }
         catch(Exception ex)
         {
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 a92768f..478d8d2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -3,7 +3,6 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devData.domain.PgCh4;
 import com.casic.PgInterface.devData.domain.PgSh;
 import com.casic.PgInterface.devData.dto.PgShDto;
 import com.casic.PgInterface.devTable.domain.PgDevice;
@@ -58,21 +57,20 @@
     //获取设备最新数据
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
-        List<PgShDto> pgShDtoList=new ArrayList<PgShDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
 
-            List<PgSh> pgShList = criteria.list();
-            if (pgShList.size() == 0)
-                return null;
-            else {
-                PgSh pgSh = pgShList.get(0);
-                return new PgShDto(pgSh);
-            }
+            List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgShList.get(0);
+            PgShDto pgShDto=new PgShDto(null);
+            pgShDto.setId(objects[0].toString());
+            pgShDto.setValue(objects[1].toString());
+            pgShDto.setLogTime(objects[2].toString());
+            pgShDto.setUpTime(objects[3].toString());
+            pgShDto.setDevCode(pgDevice.getDevCode());
+            pgShDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgShDto;
         }
         catch(Exception ex)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {
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 be64bad..7c6b3de 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -58,21 +58,20 @@
     //获取设备最新数据
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
-        List<PgO2Dto> pgO2DtoList=new ArrayList<PgO2Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgO2.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
 
-            List<PgO2> pgO2List = criteria.list();
-            if (pgO2List.size() == 0)
-                return null;
-            else {
-                PgO2 pgO2 = pgO2List.get(0);
-                return new PgO2Dto(pgO2);
-            }
+            List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgO2List.get(0);
+            PgO2Dto pgO2Dto=new PgO2Dto(null);
+            pgO2Dto.setId(objects[0].toString());
+            pgO2Dto.setValue(objects[1].toString());
+            pgO2Dto.setLogTime(objects[2].toString());
+            pgO2Dto.setUpTime(objects[3].toString());
+            pgO2Dto.setDevCode(pgDevice.getDevCode());
+            pgO2Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgO2Dto;
         }
         catch(Exception ex)
         {
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 a92768f..478d8d2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -3,7 +3,6 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devData.domain.PgCh4;
 import com.casic.PgInterface.devData.domain.PgSh;
 import com.casic.PgInterface.devData.dto.PgShDto;
 import com.casic.PgInterface.devTable.domain.PgDevice;
@@ -58,21 +57,20 @@
     //获取设备最新数据
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
-        List<PgShDto> pgShDtoList=new ArrayList<PgShDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
 
-            List<PgSh> pgShList = criteria.list();
-            if (pgShList.size() == 0)
-                return null;
-            else {
-                PgSh pgSh = pgShList.get(0);
-                return new PgShDto(pgSh);
-            }
+            List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgShList.get(0);
+            PgShDto pgShDto=new PgShDto(null);
+            pgShDto.setId(objects[0].toString());
+            pgShDto.setValue(objects[1].toString());
+            pgShDto.setLogTime(objects[2].toString());
+            pgShDto.setUpTime(objects[3].toString());
+            pgShDto.setDevCode(pgDevice.getDevCode());
+            pgShDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgShDto;
         }
         catch(Exception ex)
         {
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 7d08668..585db00 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
@@ -59,21 +59,21 @@
     //获取设备最新数据
     public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) {
 
-        List<PgTempHumDto> pgTempHumDtoList=new ArrayList<PgTempHumDto>();
-
         try {
-            Criteria criteria = createCriteria(PgTempHum.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_TEMPHUM where rownum < 2 order by UPTIME";
 
-            List<PgTempHum> pgTempHumList = criteria.list();
-            if (pgTempHumList.size() == 0)
-                return null;
-            else {
-                PgTempHum pgTempHum = pgTempHumList.get(0);
-                return new PgTempHumDto(pgTempHum);
-            }
+            List<Object[]> pgTempHumList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgTempHumList.get(0);
+            PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
+            pgTempHumDto.setId(objects[0].toString());
+            pgTempHumDto.setValueTemp(objects[1].toString());
+            pgTempHumDto.setValueHum(objects[2].toString());
+            pgTempHumDto.setLogTime(objects[3].toString());
+            pgTempHumDto.setUpTime(objects[4].toString());
+            pgTempHumDto.setDevCode(pgDevice.getDevCode());
+            pgTempHumDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgTempHumDto;
         }
         catch(Exception ex)
         {

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {
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 be64bad..7c6b3de 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -58,21 +58,20 @@
     //获取设备最新数据
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
-        List<PgO2Dto> pgO2DtoList=new ArrayList<PgO2Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgO2.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
 
-            List<PgO2> pgO2List = criteria.list();
-            if (pgO2List.size() == 0)
-                return null;
-            else {
-                PgO2 pgO2 = pgO2List.get(0);
-                return new PgO2Dto(pgO2);
-            }
+            List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgO2List.get(0);
+            PgO2Dto pgO2Dto=new PgO2Dto(null);
+            pgO2Dto.setId(objects[0].toString());
+            pgO2Dto.setValue(objects[1].toString());
+            pgO2Dto.setLogTime(objects[2].toString());
+            pgO2Dto.setUpTime(objects[3].toString());
+            pgO2Dto.setDevCode(pgDevice.getDevCode());
+            pgO2Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgO2Dto;
         }
         catch(Exception ex)
         {
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 a92768f..478d8d2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -3,7 +3,6 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devData.domain.PgCh4;
 import com.casic.PgInterface.devData.domain.PgSh;
 import com.casic.PgInterface.devData.dto.PgShDto;
 import com.casic.PgInterface.devTable.domain.PgDevice;
@@ -58,21 +57,20 @@
     //获取设备最新数据
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
-        List<PgShDto> pgShDtoList=new ArrayList<PgShDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
 
-            List<PgSh> pgShList = criteria.list();
-            if (pgShList.size() == 0)
-                return null;
-            else {
-                PgSh pgSh = pgShList.get(0);
-                return new PgShDto(pgSh);
-            }
+            List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgShList.get(0);
+            PgShDto pgShDto=new PgShDto(null);
+            pgShDto.setId(objects[0].toString());
+            pgShDto.setValue(objects[1].toString());
+            pgShDto.setLogTime(objects[2].toString());
+            pgShDto.setUpTime(objects[3].toString());
+            pgShDto.setDevCode(pgDevice.getDevCode());
+            pgShDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgShDto;
         }
         catch(Exception ex)
         {
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 7d08668..585db00 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
@@ -59,21 +59,21 @@
     //获取设备最新数据
     public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) {
 
-        List<PgTempHumDto> pgTempHumDtoList=new ArrayList<PgTempHumDto>();
-
         try {
-            Criteria criteria = createCriteria(PgTempHum.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_TEMPHUM where rownum < 2 order by UPTIME";
 
-            List<PgTempHum> pgTempHumList = criteria.list();
-            if (pgTempHumList.size() == 0)
-                return null;
-            else {
-                PgTempHum pgTempHum = pgTempHumList.get(0);
-                return new PgTempHumDto(pgTempHum);
-            }
+            List<Object[]> pgTempHumList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgTempHumList.get(0);
+            PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
+            pgTempHumDto.setId(objects[0].toString());
+            pgTempHumDto.setValueTemp(objects[1].toString());
+            pgTempHumDto.setValueHum(objects[2].toString());
+            pgTempHumDto.setLogTime(objects[3].toString());
+            pgTempHumDto.setUpTime(objects[4].toString());
+            pgTempHumDto.setDevCode(pgDevice.getDevCode());
+            pgTempHumDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgTempHumDto;
         }
         catch(Exception ex)
         {
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index 297f4aa..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
Binary files differ

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4270196..ec01dab 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aee510b5-ad61-4608-804f-06594dfcfe17" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/~$口说明新需求.docx" />
+      <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/dto/PgCh4Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/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/rs/PgCh4Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgCoRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgO2Rs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/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/rs/PgShRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.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$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" afterPath="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="PgInterface.iws" />
@@ -45,75 +35,12 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="PgCh4Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java">
+      <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="396" max-vertical-offset="1672">
-              <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
-              <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>
-      </file>
-      <file leaf-file-name="PgCoRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1092" max-vertical-offset="2288">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-                <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgO2Rs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-                <element signature="e#2628#2644#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgTempHumRs.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.85714287" vertical-offset="330" max-vertical-offset="2310">
-              <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
-              <folding>
-                <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-                <element signature="e#2748#2764#0" expanded="true" />
-                <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="PgShRs.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-              <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-              <folding>
-                <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-                <element signature="e#2626#2642#0" expanded="true" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -174,19 +101,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.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/dto/PgCoDto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgCoRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.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/dto/PgO2Dto.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.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/rs/PgShRs.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/PgShDto.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>
   </component>
@@ -438,44 +365,6 @@
               <option name="myItemId" value="PgInterface" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="reservePlan" />
-              <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="reservePlan" />
-              <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>
@@ -634,60 +523,8 @@
               <option name="myItemId" value="devData" />
               <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>
-          <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="construction" />
+              <option name="myItemId" value="domain" />
               <option name="myItemType" value="com.android.tools.idea.gradle.projectView.AndroidPsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1120,7 +957,11 @@
           <option name="PROGRAM_PARAMETERS" value="" />
         </SHUTDOWN>
       </ConfigurationWrapper>
-      <method />
+      <method>
+        <option name="BuildArtifacts" enabled="true">
+          <artifact name="PgInterface" />
+        </option>
+      </method>
     </configuration>
     <list size="1">
       <item index="0" class="java.lang.String" itemvalue="Tomcat Server.PgInterface" />
@@ -1225,7 +1066,7 @@
       <workItem from="1528961860313" duration="3105000" />
       <workItem from="1530094500311" duration="4260000" />
       <workItem from="1530146280841" duration="4637000" />
-      <workItem from="1530760861055" duration="21964000" />
+      <workItem from="1530760861055" duration="32506000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1510219102698</created>
@@ -1391,11 +1232,15 @@
       <created>1531106285620</created>
       <updated>1531106285620</updated>
     </task>
-    <option name="localTasksCounter" value="42" />
+    <task id="LOCAL-00042" summary="新增获取设备最新数据接口">
+      <created>1531108933085</created>
+      <updated>1531108933085</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="720244000" />
+    <option name="totallyTimeSpent" value="730786000" />
   </component>
   <component name="TodoView" selected-index="1">
     <todo-panel id="selected-file">
@@ -1431,7 +1276,7 @@
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.391453" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5589744" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.46153846" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32991454" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22298066" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@@ -1444,7 +1289,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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24848942" 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.26283988" 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" />
@@ -1472,7 +1317,6 @@
     <option name="myTodoPanelSettings">
       <TodoPanelSettings />
     </option>
-    <MESSAGE value="修改新增文件方法 by ym" />
     <MESSAGE value="新需求输入前上传" />
     <MESSAGE value="完成资产统计开发" />
     <MESSAGE value="完成派发工作证功能" />
@@ -1497,11 +1341,12 @@
     <MESSAGE value="修改监测设备获取信息字段名称" />
     <MESSAGE value="增加新旧资产转换接口" />
     <MESSAGE value="增加时间转换异常处理" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加时间转换异常处理" />
+    <MESSAGE value="新增获取设备最新数据接口" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增获取设备最新数据接口" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="193" />
+      <option name="time" value="201" />
     </breakpoint-manager>
   </component>
   <component name="antWorkspaceConfiguration">
@@ -1509,106 +1354,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="127" max-vertical-offset="2134">
-          <caret line="41" column="20" selection-start-line="41" selection-start-column="20" selection-end-line="41" selection-end-column="20" />
-          <folding>
-            <element signature="method#getAllDevice#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#2009#2022#0" expanded="true" />
-            <element signature="method#getDeviceBydevCode#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="method#getDeviceStatisticByDevType#0;class#PgDeviceManager#0" expanded="false" />
-            <element signature="e#3855#3868#0" expanded="true" />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
-            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="1.062724" vertical-offset="309" max-vertical-offset="7876">
-          <caret line="61" column="28" selection-start-line="61" selection-start-column="28" selection-end-line="61" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgUserManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19713262" vertical-offset="66" max-vertical-offset="1298">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgLogManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6977612" vertical-offset="396" max-vertical-offset="1276">
-          <caret line="50" column="12" selection-start-line="50" selection-start-column="12" selection-end-line="50" selection-end-column="48" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.390681" vertical-offset="112" max-vertical-offset="1188">
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
-          <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.7610063" vertical-offset="0" max-vertical-offset="2112">
-          <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <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/patroler/manager/PgAuthorityManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53172207" vertical-offset="0" max-vertical-offset="1188">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/manager/PgAlarmRuleManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3297491" vertical-offset="14" max-vertical-offset="902">
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3691756" vertical-offset="960" max-vertical-offset="1650">
-          <caret line="88" column="32" selection-start-line="88" selection-start-column="32" selection-end-line="88" selection-end-column="32" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6451613" vertical-offset="1004" max-vertical-offset="1628">
-          <caret line="85" column="28" selection-start-line="85" selection-start-column="28" selection-end-line="85" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.17204301" vertical-offset="146" max-vertical-offset="902">
-          <caret line="11" column="39" selection-start-line="11" selection-start-column="39" selection-end-line="11" selection-end-column="39" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1809,16 +1554,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.8422939" vertical-offset="938" max-vertical-offset="1694">
-          <caret line="77" column="9" selection-start-line="77" selection-start-column="9" selection-end-line="77" selection-end-column="9" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.49103943" vertical-offset="672" max-vertical-offset="1474">
@@ -1827,16 +1562,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.25089607" vertical-offset="1136" max-vertical-offset="1694">
-          <caret line="71" column="18" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
-          <folding>
-            <element signature="e#1949#1958#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.56989247" vertical-offset="694" max-vertical-offset="1474">
@@ -1845,36 +1570,6 @@
         </state>
       </provider>
     </entry>
-    <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.33333334" vertical-offset="804" max-vertical-offset="1584">
-          <caret line="76" column="46" selection-start-line="76" selection-start-column="46" selection-end-line="76" selection-end-column="46" />
-          <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.8422939" vertical-offset="872" max-vertical-offset="1694">
-          <caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
-          <folding>
-            <element signature="e#2065#2079#0" expanded="true" />
-          </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.0" vertical-offset="454" max-vertical-offset="1012">
-          <caret line="79" column="9" selection-start-line="79" selection-start-column="9" selection-end-line="79" selection-end-column="9" />
-          <folding>
-            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
-            <element signature="e#890#900#0" expanded="true" />
-            <element signature="e#2026#2036#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.4552239" vertical-offset="702" max-vertical-offset="1474">
@@ -1883,16 +1578,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.44802868" vertical-offset="1048" max-vertical-offset="1672">
-          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
-          <folding>
-            <element signature="e#1999#2008#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgLocationManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.3154122" vertical-offset="0" max-vertical-offset="558">
@@ -1901,24 +1586,13 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="1224" max-vertical-offset="2948">
-          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
-          <folding>
-            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
-            <element signature="e#2626#2642#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="2992">
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestO2InfoByDev#0;class#PgO2Rs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1929,16 +1603,110 @@
           <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
           <folding>
             <element signature="docComment;method#getNewestCoInfoByDev#0;class#PgCoRs#0" expanded="false" />
-            <element signature="e#2628#2644#0" expanded="true" />
+            <element signature="e#2628#2644#0" expanded="false" />
             <element signature="method#addCoData#0;class#PgCoRs#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3154122" vertical-offset="330" max-vertical-offset="2310">
+          <caret line="43" column="7" selection-start-line="43" selection-start-column="7" selection-end-line="43" selection-end-column="7" />
+          <folding>
+            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
+            <element signature="e#2748#2764#0" expanded="false" />
+            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgShRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.09318996" vertical-offset="1224" max-vertical-offset="2948">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="31" />
+          <folding>
+            <element signature="docComment;method#getNewestShInfoByDev#0;class#PgShRs#0" expanded="false" />
+            <element signature="e#2626#2642#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.035842296" vertical-offset="376" max-vertical-offset="1188">
+          <caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrol.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.52150536" vertical-offset="39" max-vertical-offset="1276">
+          <caret line="20" column="28" selection-start-line="20" selection-start-column="28" selection-end-line="20" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/patroler/domain/PgPatrolDoc.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.44265231" vertical-offset="39" max-vertical-offset="1298">
+          <caret line="17" column="35" selection-start-line="17" selection-start-column="31" selection-end-line="17" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="990" max-vertical-offset="5566">
+          <caret line="80" column="31" selection-start-line="80" selection-start-column="31" selection-end-line="80" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="528" max-vertical-offset="1276">
+          <caret line="135" column="0" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
+          <folding>
+            <element signature="method#setPgAlarmTypeManager#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAllAlarm#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmByTypeAndTime#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getMonthAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="method#getWeekAlarmNum#0;class#PgAlarmManager#0" expanded="false" />
+            <element signature="e#4704#4718#0" expanded="true" />
+            <element signature="method#getAlarmList#0;class#PgAlarmManager#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.48440367" vertical-offset="528" max-vertical-offset="2002">
+          <caret line="45" column="73" selection-start-line="45" selection-start-column="73" selection-end-line="45" selection-end-column="73" />
+          <folding>
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+            <marker date="1525239315804" expanded="true" signature="-1:-1" placeholder="select count..PG_ALARM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.07155963" vertical-offset="2227" max-vertical-offset="2838">
+          <caret line="113" column="48" selection-start-line="113" selection-start-column="12" selection-end-line="113" selection-end-column="48" />
+          <folding>
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select devic..PG_DEVICE..." />
+            <marker date="1530147351627" expanded="true" signature="-1:-1" placeholder="select * fro..PG_DEVICE..." />
+          </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.0" vertical-offset="396" max-vertical-offset="1672">
-          <caret line="80" column="32" selection-start-line="80" selection-start-column="11" selection-end-line="80" selection-end-column="32" />
+        <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" />
@@ -1952,18 +1720,97 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java">
+    <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.85714287" vertical-offset="330" max-vertical-offset="2310">
-          <caret line="44" column="15" selection-start-line="44" selection-start-column="15" selection-end-line="44" selection-end-column="15" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1188">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1166">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="73" column="27" selection-start-line="61" selection-start-column="11" selection-end-line="73" selection-end-column="27" />
           <folding>
-            <element signature="docComment;method#getNewestTempHumInfoByDev#0;class#PgTempHumRs#0" expanded="false" />
-            <element signature="e#2748#2764#0" expanded="true" />
-            <element signature="method#addTempHumData#0;class#PgTempHumRs#0" expanded="false" />
+            <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">
+          <caret line="14" column="20" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="20" />
+          <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="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">
+          <caret line="21" column="23" selection-start-line="21" selection-start-column="23" selection-end-line="21" selection-end-column="23" />
+          <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.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" />
+          <folding>
+            <marker date="1531192388155" expanded="true" signature="-1:-1" placeholder="select * fro..PG_TEMPHUM..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="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" />
+          <folding>
+            <marker date="1531192042963" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CO..." />
+          </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" />
+          <folding>
+            <element signature="method#getAllCH4Data#0;class#PgCh4Manager#0" expanded="false" />
+            <marker date="1531191993720" expanded="true" signature="-1:-1" placeholder="select * fro..PG_CH4..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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.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>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -1983,7 +1830,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Web (PgInterface)|Web</last-edited>
+          <last-edited>Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -2019,11 +1866,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Web|PgInterface</last-edited>
+          <last-edited>PgInterface</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.27701148" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 7cfb661..ee2acff 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -11,8 +11,8 @@
 public class PgTempHumDto implements Serializable {
 
     private String id;
-    private String temp;
-    private String hum;
+    private String valueTemp;
+    private String valueHum;
     private String upTime;
     private String logTime;
     private String devCode;
@@ -26,20 +26,20 @@
         this.id = id;
     }
 
-    public String getTemp() {
-        return temp;
+    public String getValueTemp() {
+        return valueTemp;
     }
 
-    public void setTemp(String temp) {
-        this.temp = temp;
+    public void setValueTemp(String valueTemp) {
+        this.valueTemp = valueTemp;
     }
 
-    public String getHum() {
-        return hum;
+    public String getValueHum() {
+        return valueHum;
     }
 
-    public void setHum(String hum) {
-        this.hum = hum;
+    public void setValueHum(String valueHum) {
+        this.valueHum = valueHum;
     }
 
     public String getUpTime() {
@@ -81,8 +81,8 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         this.setId(String.valueOf(pgTempHum.getId()));
-        this.setHum(pgTempHum.getHum());
-        this.setTemp(pgTempHum.getTemp());
+        this.setValueHum(pgTempHum.getHum());
+        this.setValueTemp(pgTempHum.getTemp());
         if (pgTempHum.getLogTime() != null)
             this.setLogTime(sdf.format(pgTempHum.getLogTime()));
         else
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 1373125..7a338ad 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java
@@ -60,27 +60,29 @@
     //获取设备最新数据
     public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) {
 
-        List<PgCh4Dto> pgCh4DtoList=new ArrayList<PgCh4Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CH4 where rownum < 2 order by UPTIME";
 
-            List<PgCh4> pgCh4List = criteria.list();
-            if (pgCh4List.size() == 0)
-                return null;
-            else {
-                PgCh4 pgCh4 = pgCh4List.get(0);
-                return new PgCh4Dto(pgCh4);
-            }
+            List<Object[]> pgCh4List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCh4List.get(0);
+            PgCh4Dto pgCh4Dto=new PgCh4Dto(null);
+            pgCh4Dto.setId(objects[0].toString());
+            pgCh4Dto.setValue(objects[1].toString());
+            pgCh4Dto.setLogTime(objects[2].toString());
+            pgCh4Dto.setUpTime(objects[3].toString());
+            pgCh4Dto.setDevCode(pgDevice.getDevCode());
+            pgCh4Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCh4Dto;
+
+
         }
         catch(Exception ex)
         {
             return null;
         }
+
     }
 
 
-}
+}
\ No newline at end of file
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 13f97bd..28f8704 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java
@@ -57,22 +57,20 @@
 
     //获取设备最新数据
     public PgCoDto getNewestCoData(PgDevice pgDevice) {
-
-        List<PgCoDto> pgCoDtoList=new ArrayList<PgCoDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCo.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_CO where rownum < 2 order by UPTIME";
 
-            List<PgCo> pgCoList = criteria.list();
-            if (pgCoList.size() == 0)
-                return null;
-            else {
-                PgCo pgCo = pgCoList.get(0);
-                return new PgCoDto(pgCo);
-            }
+            List<Object[]> pgCoList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgCoList.get(0);
+            PgCoDto pgCoDto=new PgCoDto(null);
+            pgCoDto.setId(objects[0].toString());
+            pgCoDto.setValue(objects[1].toString());
+            pgCoDto.setLogTime(objects[2].toString());
+            pgCoDto.setUpTime(objects[3].toString());
+            pgCoDto.setDevCode(pgDevice.getDevCode());
+            pgCoDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgCoDto;
         }
         catch(Exception ex)
         {
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 be64bad..7c6b3de 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java
@@ -58,21 +58,20 @@
     //获取设备最新数据
     public PgO2Dto getNewestO2Data(PgDevice pgDevice) {
 
-        List<PgO2Dto> pgO2DtoList=new ArrayList<PgO2Dto>();
-
         try {
-            Criteria criteria = createCriteria(PgO2.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_O2 where rownum < 2 order by UPTIME";
 
-            List<PgO2> pgO2List = criteria.list();
-            if (pgO2List.size() == 0)
-                return null;
-            else {
-                PgO2 pgO2 = pgO2List.get(0);
-                return new PgO2Dto(pgO2);
-            }
+            List<Object[]> pgO2List=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgO2List.get(0);
+            PgO2Dto pgO2Dto=new PgO2Dto(null);
+            pgO2Dto.setId(objects[0].toString());
+            pgO2Dto.setValue(objects[1].toString());
+            pgO2Dto.setLogTime(objects[2].toString());
+            pgO2Dto.setUpTime(objects[3].toString());
+            pgO2Dto.setDevCode(pgDevice.getDevCode());
+            pgO2Dto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgO2Dto;
         }
         catch(Exception ex)
         {
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 a92768f..478d8d2 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java
@@ -3,7 +3,6 @@
 import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
 import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.core.util.StringUtils;
-import com.casic.PgInterface.devData.domain.PgCh4;
 import com.casic.PgInterface.devData.domain.PgSh;
 import com.casic.PgInterface.devData.dto.PgShDto;
 import com.casic.PgInterface.devTable.domain.PgDevice;
@@ -58,21 +57,20 @@
     //获取设备最新数据
     public PgShDto getNewestShData(PgDevice pgDevice) {
 
-        List<PgShDto> pgShDtoList=new ArrayList<PgShDto>();
-
         try {
-            Criteria criteria = createCriteria(PgCh4.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_Sh where rownum < 2 order by UPTIME";
 
-            List<PgSh> pgShList = criteria.list();
-            if (pgShList.size() == 0)
-                return null;
-            else {
-                PgSh pgSh = pgShList.get(0);
-                return new PgShDto(pgSh);
-            }
+            List<Object[]> pgShList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgShList.get(0);
+            PgShDto pgShDto=new PgShDto(null);
+            pgShDto.setId(objects[0].toString());
+            pgShDto.setValue(objects[1].toString());
+            pgShDto.setLogTime(objects[2].toString());
+            pgShDto.setUpTime(objects[3].toString());
+            pgShDto.setDevCode(pgDevice.getDevCode());
+            pgShDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgShDto;
         }
         catch(Exception ex)
         {
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 7d08668..585db00 100644
--- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
+++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java
@@ -59,21 +59,21 @@
     //获取设备最新数据
     public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) {
 
-        List<PgTempHumDto> pgTempHumDtoList=new ArrayList<PgTempHumDto>();
-
         try {
-            Criteria criteria = createCriteria(PgTempHum.class);
-            criteria.addOrder(Order.desc("id"));
-            criteria.add(Restrictions.eq("pgDeviceId", pgDevice));
-            criteria.addOrder(Order.desc("upTime"));
+            String sql="select * from PG_TEMPHUM where rownum < 2 order by UPTIME";
 
-            List<PgTempHum> pgTempHumList = criteria.list();
-            if (pgTempHumList.size() == 0)
-                return null;
-            else {
-                PgTempHum pgTempHum = pgTempHumList.get(0);
-                return new PgTempHumDto(pgTempHum);
-            }
+            List<Object[]> pgTempHumList=(List<Object[]>)this.getSession().createSQLQuery(sql).list();
+            Object[] objects = pgTempHumList.get(0);
+            PgTempHumDto pgTempHumDto=new PgTempHumDto(null);
+            pgTempHumDto.setId(objects[0].toString());
+            pgTempHumDto.setValueTemp(objects[1].toString());
+            pgTempHumDto.setValueHum(objects[2].toString());
+            pgTempHumDto.setLogTime(objects[3].toString());
+            pgTempHumDto.setUpTime(objects[4].toString());
+            pgTempHumDto.setDevCode(pgDevice.getDevCode());
+            pgTempHumDto.setDevName(pgDevice.getAssetName());
+            //获取devName和devCode
+            return pgTempHumDto;
         }
         catch(Exception ex)
         {
diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
deleted file mode 100644
index 297f4aa..0000000
--- "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx"
index 4cd43b6..4da8803 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