diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
index 617eddf..74f2cae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
@@ -18,7 +18,7 @@
     List<Map<String, Object>> groupDeviceListPage(@Param("page") Page<Map<String, Object>> page, @Param("wellGroupId") String wellGroupId,
                                                   @Param("scope") DataScope dataScope, @Param("dataOrder") String dataOrder);
 
-    List<Map<String, Object>> tubeDataHistory(@Param("page") Page<Map<String, Object>> page, @Param("devcode") String devcode,
+    List<Map<String, Object>> tubeDataHistory(@Param("devcode") String devcode,
                                               @Param("beginTime") String beginTime, @Param("endTime") String endTime,
                                               @Param("wellGroupId") String wellGroupId);
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
index 617eddf..74f2cae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
@@ -18,7 +18,7 @@
     List<Map<String, Object>> groupDeviceListPage(@Param("page") Page<Map<String, Object>> page, @Param("wellGroupId") String wellGroupId,
                                                   @Param("scope") DataScope dataScope, @Param("dataOrder") String dataOrder);
 
-    List<Map<String, Object>> tubeDataHistory(@Param("page") Page<Map<String, Object>> page, @Param("devcode") String devcode,
+    List<Map<String, Object>> tubeDataHistory(@Param("devcode") String devcode,
                                               @Param("beginTime") String beginTime, @Param("endTime") String endTime,
                                               @Param("wellGroupId") String wellGroupId);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
index 2d228bd..4f6c985 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
@@ -31,46 +31,71 @@
                   LNG_GAODE  AS  "lngGaode",LAT_GAODE  AS  "latGaode",AREA  AS "area",POSITION  AS "position",
                   RESPONSIBLE_DEPT AS  "responsibleDept",PHOTOS  AS  photos,WELL_TYPE AS  wellType,STAFF AS staff,TEL AS "tel" ,
                   bwi.VALID  AS  valid,BFZT  AS  bfzt,WELL_FLAG_1 AS  "groupId",DEPTID as  deptid,bdm.MODEL_NAME AS "modelName"
-      FROM  bus_device  bd
+      FROM
+      (
+         SELECT  *
+         FROM  bus_device
+         WHERE DEVICE_TYPE=12
+      )  bd
 	  INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-	  INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
+	  INNER JOIN
+	  (
+         SELECT  *
+         FROM  bus_well_info
+         WHERE VALID='1'
+         AND WELL_FLAG_1  is NOT null
+      )bwi    ON  bdw.WELL_ID=bwi.id
 	  INNER JOIN base_device_models   bdm    ON  bdm.ID=bd.VERSION
-      WHERE  bd.DEVICE_TYPE=12  AND   bwi.VALID='1'
     </select>
 
     <select id="deviceGroupsList" resultType="MAP">
-      SELECT INSTALL_DATE AS "installDate",bwi.LNG_GAODE AS "lngGaode",bwi.LAT_GAODE AS "latGaode",bwi.WELL_FLAG_1 AS  "groupId",
-             bwi.WELL_CODE  AS  "wellCode",bwi.Id AS  "wellId",DEPTID as  deptid
-  	 FROM  bus_device  bd
-	 INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-	 INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
-      WHERE  bd.DEVICE_TYPE='12'  AND   bwi.VALID='1'
+           SELECT   INSTALL_DATE AS "installDate",bwi.LNG_GAODE AS "lngGaode",bwi.LAT_GAODE AS "latGaode",bwi.WELL_FLAG_1 AS  "groupId",
+              bwi.WELL_CODE  AS  "wellCode",bwi.Id AS  "wellId",DEPTID as  deptid,
+						  SUM(case when bd.VALID='1' THEN 0 ELSE 1 END ) AS  unalive,
+						  SUM(case when bd.VALID='0' THEN 0 ELSE 1 END ) AS  alive,COUNT(BD.id) AS "totalDevice"
+  	 FROM  (
+         SELECT  *
+         FROM  bus_device
+         WHERE DEVICE_TYPE=12
+      )  bd
+	  JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
+	  JOIN
+	  (
+         SELECT  *
+         FROM  bus_well_info
+         WHERE WELL_FLAG_1  is NOT null
+      ) bwi    ON  bdw.WELL_ID=bwi.id
 	  GROUP BY   WELL_FLAG_1
     </select>
 
     <select id="groupDeviceListPage" resultType="MAP">
-  	    SELECT  bd.DEVCODE AS devcode,STRENGTH AS strength,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-			  pci,rsrp,snr,cell,dt.ID AS "tubeId",bwi.WELL_NAME AS  "wellName",DEPTID as  deptid,bd.DEVICE_NAME  AS  "deviceName",bwi.Valid   AS  "isUse"
-	      FROM  bus_device  bd
+  	    SELECT  bd.DEVCODE AS devcode,STRENGTH AS strength,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,LNG_GAODE  AS  "lngGaode",LAT_GAODE  AS  "latGaode",
+			  pci,rsrp,snr,cell,dt.ID AS "tubeId",bwi.WELL_NAME AS  "wellName",DEPTID as  deptid,bd.DEVICE_NAME  AS  "deviceName",bwi.Valid   AS  "isUse",
+			           DATE_FORMAT(bd.install_date,'%Y-%m-%d') AS "installDate",bd.id AS "deviceId"
+	    FROM  bus_device  bd
         INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
-			  LEFT  JOIN (
+        INNER JOIN
+        (
+            select   *
+            From bus_well_info
+            WHERE  WELL_FLAG_1=#{wellGroupId}
+        )bwi  ON  bdw.WELL_ID=bwi.id
+		LEFT  JOIN (
 			     SELECT  *
-					 FROM  data_tube  dt
+				 FROM  data_tube_view  dt
 			     JOIN (SELECT  MAX(UPTIME)  AS  time,DEVCODE as  code
-	                   FROM  data_tube  dt
+	                   FROM  data_tube_view  dt
 				        	   GROUP BY DEVCODE
                  ) dtt  ON  dtt.code=dt.DEVCODE  AND  dtt.time=dt.UPTIME
                 group by  dt.DEVCODE
-				) dt   ON  dt.DEVCODE=bd.DEVCODE
-        WHERE  bwi.WELL_FLAG_1=#{wellGroupId}
+		) dt   ON  dt.DEVCODE=bd.DEVCODE
         ORDER  BY  strength  ${dataOrder}
     </select>
 
     <select id="tubeDataHistory" resultType="MAP">
         SELECT dt.ID as id ,dt.WELL_CODE as "wellCode",DEVCODE as "devcode",CELL AS "cell",STRENGTH AS "stregnth",
-        DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bwi.Valid   AS  "isUse"
-        FROM data_tube dt
+        DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,pci,rsrp,snr,bwi.Valid AS "isUse"
+        FROM data_tube_view dt
         INNER JOIN bus_well_info bwi ON dt.WELL_CODE=bwi.WELL_CODE
         WHERE DEVCODE=#{devcode} AND bwi.WELL_FLAG_1=#{wellGroupId}
         <choose>
@@ -96,68 +121,116 @@
     <select id="groupDeviceList" resultType="MAP">
         SELECT LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVCODE AS devcode,bd.DEVICE_TYPE as deviceType,
         bd.DEVICE_NAME AS deviceName,
-        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_id,STRENGTH AS strength,bzt.uptime,
+        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_view_id,STRENGTH AS strength,bzt.uptime,
         RESPONSIBLE_DEPT AS "responsibleDept", STAFF AS staff, TEL AS "tel", WELL_FLAG_1 AS "groupId",DEPTID AS deptid
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
+        FROM (
+        SELECT *
+        FROM bus_device
+        WHERE DEVICE_TYPE=12
+        ) bd
+        JOIN
+        (
+        SELECT *
+        FROM bus_device_well
+        WHERE VALID='1'
+        ) bdw ON bdw.DEVICE_ID=bd.id
+        JOIN (
+        SELECT *
+        FROM bus_well_info
+        WHERE VALID='1'
+        <if test="wellGroupId != null and wellGroupId !=''">
+            AND WELL_FLAG_1=#{wellGroupId}
+        </if>
+        ) bwi ON bdw.WELL_ID=bwi.id
         LEFT JOIN (
-        SELECT DEVCODE,STRENGTH,WELL_CODE,id as data_tube_id,DATE_FORMAT(max(UPTIME),'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM data_tube
+        SELECT DEVCODE,STRENGTH,WELL_CODE,id as data_tube_view_id,DATE_FORMAT(max(UPTIME),'%Y-%m-%d %H:%i:%S') AS uptime
+        FROM data_tube_view
         GROUP BY DEVCODE
         ) bzt ON bzt.DEVCODE=bd.DEVCODE
-        WHERE bd.DEVICE_TYPE=12
-        AND bwi.VALID=1 and bdw.VALID=1
-        <if test="wellGroupId != null and wellGroupId !=''">
-            AND bwi.WELL_FLAG_1=#{wellGroupId}
-        </if>
     </select>
 
     <select id="deviceDetail" resultType="MAP">
          SELECT bwi.WELL_CODE as "wellCode",bd.DEVCODE as "devcode",dt.CELL AS "cell",dt.STRENGTH AS  "stregnth",
-				DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE  AS "onlineState",
-				LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME  AS "deviceName",bwi.WELL_FLAG_1  AS "groupId",bwi.Valid   AS  "isUse"
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
+         DATE_FORMAT(bd.install_date,'%Y-%m-%d') AS "installDate",
+		 DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE  AS "onlineState",bwi.notes as descn,bwi.photos as "photos",
+		 LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME  AS "deviceName",bwi.WELL_FLAG_1  AS "groupId",bwi.Valid   AS  "isUse"
+        FROM  bus_device_well bdw
+        JOIN (
+              select  *
+              FROM bus_device bd
+              WHERE DEVCODE=#{devcode}
+        ) bd
+         ON  bdw.DEVICE_ID=bd.id
+        INNER JOIN
+        (
+            select   *
+            From bus_well_info
+            WHERE  WELL_FLAG_1=#{wellGroupId}
+        )bwi
+        ON bdw.WELL_ID=bwi.id
         LEFT  JOIN  (
-				SELECT dt.DEVCODE,STRENGTH,WELL_CODE,CELL,pci,rsrp,snr,id as data_tube_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM  data_tube  dt,(SELECT  max(UPTIME) AS  uptime,DEVCODE
-                            FROM  data_tube
-                            WHERE    DEVCODE=#{devcode}
-                            )  dtl
-				WHERE  dtl.DEVCODE=dt.DEVCODE
-        AND  dt.UPTIME=dtl.uptime)
-		dt 	ON  bd.DEVCODE=dt.DEVCODE
-        WHERE    bd.DEVCODE=#{devcode}
-        AND bwi.WELL_FLAG_1=#{wellGroupId}
+				   SELECT dt.DEVCODE,STRENGTH,WELL_CODE,CELL,pci,rsrp,snr,id as data_tube_view_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
+                   FROM  data_tube_view  dt
+                   JOIN  (SELECT  max(UPTIME) AS  uptime,DEVCODE
+                                         FROM  data_tube_view
+                                          WHERE    DEVCODE=#{devcode}
+                                         )  dtl
+		           ON dtl.DEVCODE=dt.DEVCODE  AND  dt.UPTIME=dtl.uptime)dt
+		ON  bd.DEVCODE=dt.DEVCODE
     </select>
 
 
     <select id="latestData" resultType="MAP">
-		SELECT LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVCODE AS devcode,bd.DEVICE_TYPE as deviceType,
-        bd.DEVICE_NAME AS deviceName,bwi.Valid   AS  "isUse",
-        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_id,STRENGTH AS strength,bzt.uptime,
-        RESPONSIBLE_DEPT AS "responsibleDept", STAFF AS staff, TEL AS "tel", WELL_FLAG_1 AS "groupId",DEPTID AS deptid
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
-        LEFT JOIN (
-        SELECT dt.DEVCODE,STRENGTH,WELL_CODE,id as data_tube_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM  data_tube  dt,(SELECT  max(UPTIME) AS  uptime,DEVCODE
-                         FROM  data_tube
-                         WHERE DEVCODE=#{devcode}) dtl
-        WHERE  dtl.DEVCODE=dt.DEVCODE
-        AND  dt.UPTIME=dtl.uptime
-        ) bzt ON bzt.DEVCODE=bd.DEVCODE
-        WHERE   bd.DEVCODE=#{devcode}
-        AND bwi.WELL_FLAG_1=#{wellGroupId}
+        SELECT
+            LNG_GAODE AS "lngGaode",
+            LAT_GAODE AS "latGaode",
+            bd.DEVCODE AS devcode,
+            bd.DEVICE_TYPE AS deviceType,
+            bd.DEVICE_NAME AS deviceName,
+            bwi.Valid AS "isUse",
+            bwi.WELL_CODE AS "wellCode",
+            WELL_NAME AS "wellName",
+            bzt.data_tube_view_id,
+            STRENGTH AS strength,
+            bzt.uptime,
+            RESPONSIBLE_DEPT AS "responsibleDept",
+            STAFF AS staff,
+            TEL AS "tel",
+            WELL_FLAG_1 AS "groupId",
+            DEPTID AS deptid
+        FROM
+            bus_device_well bdw
+            JOIN (
+                SELECT * FROM bus_device bd WHERE DEVCODE=#{devcode} AND VALID = '1'
+            ) bd ON bdw.DEVICE_ID = bd.id
+            INNER JOIN (
+                SELECT * FROM bus_well_info
+                        WHERE  WELL_FLAG_1=#{wellGroupId}   AND VALID='1'
+            ) bwi   ON  bdw.WELL_ID=bwi.id
+            LEFT JOIN (
+              SELECT
+                    dt.DEVCODE,
+                    STRENGTH,
+                    WELL_CODE,
+                    id AS data_tube_view_id,
+                    DATE_FORMAT( dt.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime
+              FROM
+                    data_tube_view dt  JOIN (
+                    SELECT
+                        max( UPTIME ) AS uptime,
+                        DEVCODE
+                    FROM
+                        data_tube_view
+                    WHERE DEVCODE=#{devcode}) dtl
+                ON  dtl.DEVCODE = dt.DEVCODE and dtl.UPTIME=dt.UPTIME
+            ) bzt ON bzt.DEVCODE = bd.DEVCODE
     </select>
 
     <select id="existsDevice" resultType="String">
 			SELECT ID
 			FROM   bus_device
 			WHERE  DEVCODE=#{devcode}
+			AND VALID='1'
     </select>
 
     <select id="getGroupDict" resultType="String">
@@ -217,7 +290,7 @@
 
     <delete id="deleteDataTube">
 		DELETE
-        FROM  data_tube
+        FROM  data_tube_view
 		WHERE  DEVCODE=#{devcode}
 		AND   WELL_CODE=#{wellCode}
     </delete>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
index 617eddf..74f2cae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java
@@ -18,7 +18,7 @@
     List<Map<String, Object>> groupDeviceListPage(@Param("page") Page<Map<String, Object>> page, @Param("wellGroupId") String wellGroupId,
                                                   @Param("scope") DataScope dataScope, @Param("dataOrder") String dataOrder);
 
-    List<Map<String, Object>> tubeDataHistory(@Param("page") Page<Map<String, Object>> page, @Param("devcode") String devcode,
+    List<Map<String, Object>> tubeDataHistory(@Param("devcode") String devcode,
                                               @Param("beginTime") String beginTime, @Param("endTime") String endTime,
                                               @Param("wellGroupId") String wellGroupId);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
index 2d228bd..4f6c985 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceTubeMapper.xml
@@ -31,46 +31,71 @@
                   LNG_GAODE  AS  "lngGaode",LAT_GAODE  AS  "latGaode",AREA  AS "area",POSITION  AS "position",
                   RESPONSIBLE_DEPT AS  "responsibleDept",PHOTOS  AS  photos,WELL_TYPE AS  wellType,STAFF AS staff,TEL AS "tel" ,
                   bwi.VALID  AS  valid,BFZT  AS  bfzt,WELL_FLAG_1 AS  "groupId",DEPTID as  deptid,bdm.MODEL_NAME AS "modelName"
-      FROM  bus_device  bd
+      FROM
+      (
+         SELECT  *
+         FROM  bus_device
+         WHERE DEVICE_TYPE=12
+      )  bd
 	  INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-	  INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
+	  INNER JOIN
+	  (
+         SELECT  *
+         FROM  bus_well_info
+         WHERE VALID='1'
+         AND WELL_FLAG_1  is NOT null
+      )bwi    ON  bdw.WELL_ID=bwi.id
 	  INNER JOIN base_device_models   bdm    ON  bdm.ID=bd.VERSION
-      WHERE  bd.DEVICE_TYPE=12  AND   bwi.VALID='1'
     </select>
 
     <select id="deviceGroupsList" resultType="MAP">
-      SELECT INSTALL_DATE AS "installDate",bwi.LNG_GAODE AS "lngGaode",bwi.LAT_GAODE AS "latGaode",bwi.WELL_FLAG_1 AS  "groupId",
-             bwi.WELL_CODE  AS  "wellCode",bwi.Id AS  "wellId",DEPTID as  deptid
-  	 FROM  bus_device  bd
-	 INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-	 INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
-      WHERE  bd.DEVICE_TYPE='12'  AND   bwi.VALID='1'
+           SELECT   INSTALL_DATE AS "installDate",bwi.LNG_GAODE AS "lngGaode",bwi.LAT_GAODE AS "latGaode",bwi.WELL_FLAG_1 AS  "groupId",
+              bwi.WELL_CODE  AS  "wellCode",bwi.Id AS  "wellId",DEPTID as  deptid,
+						  SUM(case when bd.VALID='1' THEN 0 ELSE 1 END ) AS  unalive,
+						  SUM(case when bd.VALID='0' THEN 0 ELSE 1 END ) AS  alive,COUNT(BD.id) AS "totalDevice"
+  	 FROM  (
+         SELECT  *
+         FROM  bus_device
+         WHERE DEVICE_TYPE=12
+      )  bd
+	  JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
+	  JOIN
+	  (
+         SELECT  *
+         FROM  bus_well_info
+         WHERE WELL_FLAG_1  is NOT null
+      ) bwi    ON  bdw.WELL_ID=bwi.id
 	  GROUP BY   WELL_FLAG_1
     </select>
 
     <select id="groupDeviceListPage" resultType="MAP">
-  	    SELECT  bd.DEVCODE AS devcode,STRENGTH AS strength,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
-			  pci,rsrp,snr,cell,dt.ID AS "tubeId",bwi.WELL_NAME AS  "wellName",DEPTID as  deptid,bd.DEVICE_NAME  AS  "deviceName",bwi.Valid   AS  "isUse"
-	      FROM  bus_device  bd
+  	    SELECT  bd.DEVCODE AS devcode,STRENGTH AS strength,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,LNG_GAODE  AS  "lngGaode",LAT_GAODE  AS  "latGaode",
+			  pci,rsrp,snr,cell,dt.ID AS "tubeId",bwi.WELL_NAME AS  "wellName",DEPTID as  deptid,bd.DEVICE_NAME  AS  "deviceName",bwi.Valid   AS  "isUse",
+			           DATE_FORMAT(bd.install_date,'%Y-%m-%d') AS "installDate",bd.id AS "deviceId"
+	    FROM  bus_device  bd
         INNER JOIN bus_device_well bdw    ON  bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info   bwi    ON  bdw.WELL_ID=bwi.id
-			  LEFT  JOIN (
+        INNER JOIN
+        (
+            select   *
+            From bus_well_info
+            WHERE  WELL_FLAG_1=#{wellGroupId}
+        )bwi  ON  bdw.WELL_ID=bwi.id
+		LEFT  JOIN (
 			     SELECT  *
-					 FROM  data_tube  dt
+				 FROM  data_tube_view  dt
 			     JOIN (SELECT  MAX(UPTIME)  AS  time,DEVCODE as  code
-	                   FROM  data_tube  dt
+	                   FROM  data_tube_view  dt
 				        	   GROUP BY DEVCODE
                  ) dtt  ON  dtt.code=dt.DEVCODE  AND  dtt.time=dt.UPTIME
                 group by  dt.DEVCODE
-				) dt   ON  dt.DEVCODE=bd.DEVCODE
-        WHERE  bwi.WELL_FLAG_1=#{wellGroupId}
+		) dt   ON  dt.DEVCODE=bd.DEVCODE
         ORDER  BY  strength  ${dataOrder}
     </select>
 
     <select id="tubeDataHistory" resultType="MAP">
         SELECT dt.ID as id ,dt.WELL_CODE as "wellCode",DEVCODE as "devcode",CELL AS "cell",STRENGTH AS "stregnth",
-        DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bwi.Valid   AS  "isUse"
-        FROM data_tube dt
+        DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,pci,rsrp,snr,bwi.Valid AS "isUse"
+        FROM data_tube_view dt
         INNER JOIN bus_well_info bwi ON dt.WELL_CODE=bwi.WELL_CODE
         WHERE DEVCODE=#{devcode} AND bwi.WELL_FLAG_1=#{wellGroupId}
         <choose>
@@ -96,68 +121,116 @@
     <select id="groupDeviceList" resultType="MAP">
         SELECT LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVCODE AS devcode,bd.DEVICE_TYPE as deviceType,
         bd.DEVICE_NAME AS deviceName,
-        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_id,STRENGTH AS strength,bzt.uptime,
+        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_view_id,STRENGTH AS strength,bzt.uptime,
         RESPONSIBLE_DEPT AS "responsibleDept", STAFF AS staff, TEL AS "tel", WELL_FLAG_1 AS "groupId",DEPTID AS deptid
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
+        FROM (
+        SELECT *
+        FROM bus_device
+        WHERE DEVICE_TYPE=12
+        ) bd
+        JOIN
+        (
+        SELECT *
+        FROM bus_device_well
+        WHERE VALID='1'
+        ) bdw ON bdw.DEVICE_ID=bd.id
+        JOIN (
+        SELECT *
+        FROM bus_well_info
+        WHERE VALID='1'
+        <if test="wellGroupId != null and wellGroupId !=''">
+            AND WELL_FLAG_1=#{wellGroupId}
+        </if>
+        ) bwi ON bdw.WELL_ID=bwi.id
         LEFT JOIN (
-        SELECT DEVCODE,STRENGTH,WELL_CODE,id as data_tube_id,DATE_FORMAT(max(UPTIME),'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM data_tube
+        SELECT DEVCODE,STRENGTH,WELL_CODE,id as data_tube_view_id,DATE_FORMAT(max(UPTIME),'%Y-%m-%d %H:%i:%S') AS uptime
+        FROM data_tube_view
         GROUP BY DEVCODE
         ) bzt ON bzt.DEVCODE=bd.DEVCODE
-        WHERE bd.DEVICE_TYPE=12
-        AND bwi.VALID=1 and bdw.VALID=1
-        <if test="wellGroupId != null and wellGroupId !=''">
-            AND bwi.WELL_FLAG_1=#{wellGroupId}
-        </if>
     </select>
 
     <select id="deviceDetail" resultType="MAP">
          SELECT bwi.WELL_CODE as "wellCode",bd.DEVCODE as "devcode",dt.CELL AS "cell",dt.STRENGTH AS  "stregnth",
-				DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE  AS "onlineState",
-				LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME  AS "deviceName",bwi.WELL_FLAG_1  AS "groupId",bwi.Valid   AS  "isUse"
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
+         DATE_FORMAT(bd.install_date,'%Y-%m-%d') AS "installDate",
+		 DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime ,pci,rsrp,snr,bd.ONLINE_STATE  AS "onlineState",bwi.notes as descn,bwi.photos as "photos",
+		 LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVICE_NAME  AS "deviceName",bwi.WELL_FLAG_1  AS "groupId",bwi.Valid   AS  "isUse"
+        FROM  bus_device_well bdw
+        JOIN (
+              select  *
+              FROM bus_device bd
+              WHERE DEVCODE=#{devcode}
+        ) bd
+         ON  bdw.DEVICE_ID=bd.id
+        INNER JOIN
+        (
+            select   *
+            From bus_well_info
+            WHERE  WELL_FLAG_1=#{wellGroupId}
+        )bwi
+        ON bdw.WELL_ID=bwi.id
         LEFT  JOIN  (
-				SELECT dt.DEVCODE,STRENGTH,WELL_CODE,CELL,pci,rsrp,snr,id as data_tube_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM  data_tube  dt,(SELECT  max(UPTIME) AS  uptime,DEVCODE
-                            FROM  data_tube
-                            WHERE    DEVCODE=#{devcode}
-                            )  dtl
-				WHERE  dtl.DEVCODE=dt.DEVCODE
-        AND  dt.UPTIME=dtl.uptime)
-		dt 	ON  bd.DEVCODE=dt.DEVCODE
-        WHERE    bd.DEVCODE=#{devcode}
-        AND bwi.WELL_FLAG_1=#{wellGroupId}
+				   SELECT dt.DEVCODE,STRENGTH,WELL_CODE,CELL,pci,rsrp,snr,id as data_tube_view_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
+                   FROM  data_tube_view  dt
+                   JOIN  (SELECT  max(UPTIME) AS  uptime,DEVCODE
+                                         FROM  data_tube_view
+                                          WHERE    DEVCODE=#{devcode}
+                                         )  dtl
+		           ON dtl.DEVCODE=dt.DEVCODE  AND  dt.UPTIME=dtl.uptime)dt
+		ON  bd.DEVCODE=dt.DEVCODE
     </select>
 
 
     <select id="latestData" resultType="MAP">
-		SELECT LNG_GAODE AS "lngGaode",LAT_GAODE AS "latGaode",bd.DEVCODE AS devcode,bd.DEVICE_TYPE as deviceType,
-        bd.DEVICE_NAME AS deviceName,bwi.Valid   AS  "isUse",
-        bwi.WELL_CODE AS "wellCode", WELL_NAME AS "wellName",bzt.data_tube_id,STRENGTH AS strength,bzt.uptime,
-        RESPONSIBLE_DEPT AS "responsibleDept", STAFF AS staff, TEL AS "tel", WELL_FLAG_1 AS "groupId",DEPTID AS deptid
-        FROM bus_device bd
-        INNER JOIN bus_device_well bdw ON bdw.DEVICE_ID=bd.id
-        INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.id
-        LEFT JOIN (
-        SELECT dt.DEVCODE,STRENGTH,WELL_CODE,id as data_tube_id,DATE_FORMAT(dt.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
-        FROM  data_tube  dt,(SELECT  max(UPTIME) AS  uptime,DEVCODE
-                         FROM  data_tube
-                         WHERE DEVCODE=#{devcode}) dtl
-        WHERE  dtl.DEVCODE=dt.DEVCODE
-        AND  dt.UPTIME=dtl.uptime
-        ) bzt ON bzt.DEVCODE=bd.DEVCODE
-        WHERE   bd.DEVCODE=#{devcode}
-        AND bwi.WELL_FLAG_1=#{wellGroupId}
+        SELECT
+            LNG_GAODE AS "lngGaode",
+            LAT_GAODE AS "latGaode",
+            bd.DEVCODE AS devcode,
+            bd.DEVICE_TYPE AS deviceType,
+            bd.DEVICE_NAME AS deviceName,
+            bwi.Valid AS "isUse",
+            bwi.WELL_CODE AS "wellCode",
+            WELL_NAME AS "wellName",
+            bzt.data_tube_view_id,
+            STRENGTH AS strength,
+            bzt.uptime,
+            RESPONSIBLE_DEPT AS "responsibleDept",
+            STAFF AS staff,
+            TEL AS "tel",
+            WELL_FLAG_1 AS "groupId",
+            DEPTID AS deptid
+        FROM
+            bus_device_well bdw
+            JOIN (
+                SELECT * FROM bus_device bd WHERE DEVCODE=#{devcode} AND VALID = '1'
+            ) bd ON bdw.DEVICE_ID = bd.id
+            INNER JOIN (
+                SELECT * FROM bus_well_info
+                        WHERE  WELL_FLAG_1=#{wellGroupId}   AND VALID='1'
+            ) bwi   ON  bdw.WELL_ID=bwi.id
+            LEFT JOIN (
+              SELECT
+                    dt.DEVCODE,
+                    STRENGTH,
+                    WELL_CODE,
+                    id AS data_tube_view_id,
+                    DATE_FORMAT( dt.UPTIME, '%Y-%m-%d %H:%i:%S' ) AS uptime
+              FROM
+                    data_tube_view dt  JOIN (
+                    SELECT
+                        max( UPTIME ) AS uptime,
+                        DEVCODE
+                    FROM
+                        data_tube_view
+                    WHERE DEVCODE=#{devcode}) dtl
+                ON  dtl.DEVCODE = dt.DEVCODE and dtl.UPTIME=dt.UPTIME
+            ) bzt ON bzt.DEVCODE = bd.DEVCODE
     </select>
 
     <select id="existsDevice" resultType="String">
 			SELECT ID
 			FROM   bus_device
 			WHERE  DEVCODE=#{devcode}
+			AND VALID='1'
     </select>
 
     <select id="getGroupDict" resultType="String">
@@ -217,7 +290,7 @@
 
     <delete id="deleteDataTube">
 		DELETE
-        FROM  data_tube
+        FROM  data_tube_view
 		WHERE  DEVCODE=#{devcode}
 		AND   WELL_CODE=#{wellCode}
     </delete>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java
index a332560..c821727 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java
@@ -108,7 +108,7 @@
     public Object tubeDataHistory(Page<Map<String, Object>> page, String devcode, String beginTime, String endTime, String wellGroupId) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> tubeDeviceList = deviceTubeMapper.tubeDataHistory(page, devcode, beginTime, endTime, wellGroupId);
+            List<Map<String, Object>> tubeDeviceList = deviceTubeMapper.tubeDataHistory(devcode, beginTime, endTime, wellGroupId);
             responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE);
             responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE);
             responseData.setData(tubeDeviceList);