diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index f4dac57..8e00943 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -145,7 +145,7 @@
         //设备类型列表查询
         QueryWrapper<DeviceModels> query = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(deviceType)) {
-            query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+            query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
         }
         List<DeviceModels> list = deviceModelsService.list(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index f4dac57..8e00943 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -145,7 +145,7 @@
         //设备类型列表查询
         QueryWrapper<DeviceModels> query = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(deviceType)) {
-            query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+            query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
         }
         List<DeviceModels> list = deviceModelsService.list(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index d7d2c4f..53359ac 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -58,7 +58,7 @@
             isValid = "";
         }
         QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .like("TYPE_NAME", deviceType).like("VALID", isValid);
+                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
         page = deviceTypeService.page(page, query);
         return new SuccessResponseData(super.packForBT(page));
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index f4dac57..8e00943 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -145,7 +145,7 @@
         //设备类型列表查询
         QueryWrapper<DeviceModels> query = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(deviceType)) {
-            query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+            query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
         }
         List<DeviceModels> list = deviceModelsService.list(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index d7d2c4f..53359ac 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -58,7 +58,7 @@
             isValid = "";
         }
         QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .like("TYPE_NAME", deviceType).like("VALID", isValid);
+                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
         page = deviceTypeService.page(page, query);
         return new SuccessResponseData(super.packForBT(page));
     }
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 a8e0b37..2367d94 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
@@ -3,49 +3,152 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.DeviceTubeMapper">
 
     <sql id="data_diff" databaseId="mysql">
-         and datediff(now(),UPTIME) <![CDATA[< ]]> 3
+         and datediff(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="pgsql">
-        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]> 3
+        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),UPTIME) <![CDATA[< ]]>  3
+         and date_part(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
+    <sql id="char_toDate" databaseId="mysql">
+       str_to_date(${paramStr},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
 
     <select id="deviceList" resultType="MAP">
-      SELECT  *
+      SELECT  bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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
       FROM  bus_well_info  bwi,
       bus_device_well   bdw,
-      bus_device  bd  " +
+      bus_device  bd
       WHERE  bd.DEVICE_TYPE='16'
-      AND   bwi.WELL_FLAG_1='1'
       AND   bdw.WELL_ID=bwi.ID
       AND   bd.ID=bdw.DEVICE_ID
     </select>
 
-    <select id="deviceList" resultType="MAP">
-        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,
+			bus_well_info bwi,
+      bus_device_well bdw
+      WHERE  bd.DEVICE_TYPE='16'
+      AND   bdw.WELL_ID=bwi.ID
+      AND  bdw.DEVICE_ID = bd.ID
+	  GROUP BY   WELL_FLAG_1
+    </select>
+
+    <select id="groupDeviceListPage" resultType="MAP">
+       SELECT    bd.DEVCODE,bd.DEVICE_NAME,bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",
+                  RESPONSIBLE_DEPT AS  "responsibleDept",STAFF AS staff,TEL AS "tel",
+                  WELL_FLAG_1 AS  "groupId",DEPTID as  deptid
         FROM  bus_well_info  bwi,
         bus_device_well   bdw,
         bus_device  bd
-        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,UPTIME
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1='1'
+		GROUP BY  bd.DEVCODE
+    </select>
+
+    <select id="dataTubeByDevcode" resultType="MAP">
+        SELECT DEVCODE AS devcode,STRENGTH AS strength,
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime,
+        pci,rsrp,snr,cell,ID AS "tubeId"
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        ORDER BY UPTIME desc
+        LIMIT 1
+    </select>
+
+    <select id="tubeDataHistory" resultType="MAP">
+        SELECT ID as id ,WELL_CODE as "wellCode",DEVCODE as "devcode",CELL AS "cell",STRENGTH AS "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime ,pci,rsrp,snr
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        <choose>
+            <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                AND UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+                AND UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </when>
+            <otherwise>
+                <include refid="data_diff">
+                    <property name="paramDay" value="7"/>
+                </include>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="groupDeviceList" resultType="MAP">
+        SELECT   bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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,STRENGTH AS strength,data_tube_id
+        FROM  bus_well_info  bwi,
+        bus_device_well   bdw,
+        bus_device  bd
+        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
         FROM    data_tube
-        WHERE    <include refid="data_diff"/>
-        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " +
-        WHERE  bd.DEVICE_TYPE='16' " +
-        AND   bwi.WELL_FLAG_1=#{wellGroupId}" +
+        WHERE   datediff(now(),UPTIME) <![CDATA[<= ]]> 3
+        AND  datediff(now(),UPTIME) <![CDATA[>= ]]> 0
+        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1=#{wellGroupId}
         AND   bdw.WELL_ID=bwi.ID
         AND   bd.ID=bdw.DEVICE_ID
     </select>
 
     <select id="deviceDetail" resultType="MAP">
-        SELECT  *
-        FROM  data_tube
-        WHERE id=#{id}
+        SELECT dt.ID as id ,dt.WELL_CODE as "wellCode",dt.DEVCODE as "devcode",dt.CELL AS "cell",dt.STRENGTH AS
+        "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>  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"
+        FROM data_tube dt,
+        bus_well_info bwi,
+        bus_device_well bdw,
+        bus_device bd
+        WHERE dt.id=#{id}
+        AND bdw.WELL_ID=bwi.ID
+        AND bdw.DEVICE_ID = bd.ID
+        AND bd.DEVCODE=dt.DEVCODE
     </select>
 
-
 </mapper>
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index f4dac57..8e00943 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -145,7 +145,7 @@
         //设备类型列表查询
         QueryWrapper<DeviceModels> query = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(deviceType)) {
-            query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+            query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
         }
         List<DeviceModels> list = deviceModelsService.list(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index d7d2c4f..53359ac 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -58,7 +58,7 @@
             isValid = "";
         }
         QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .like("TYPE_NAME", deviceType).like("VALID", isValid);
+                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
         page = deviceTypeService.page(page, query);
         return new SuccessResponseData(super.packForBT(page));
     }
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 a8e0b37..2367d94 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
@@ -3,49 +3,152 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.DeviceTubeMapper">
 
     <sql id="data_diff" databaseId="mysql">
-         and datediff(now(),UPTIME) <![CDATA[< ]]> 3
+         and datediff(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="pgsql">
-        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]> 3
+        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),UPTIME) <![CDATA[< ]]>  3
+         and date_part(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
+    <sql id="char_toDate" databaseId="mysql">
+       str_to_date(${paramStr},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
 
     <select id="deviceList" resultType="MAP">
-      SELECT  *
+      SELECT  bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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
       FROM  bus_well_info  bwi,
       bus_device_well   bdw,
-      bus_device  bd  " +
+      bus_device  bd
       WHERE  bd.DEVICE_TYPE='16'
-      AND   bwi.WELL_FLAG_1='1'
       AND   bdw.WELL_ID=bwi.ID
       AND   bd.ID=bdw.DEVICE_ID
     </select>
 
-    <select id="deviceList" resultType="MAP">
-        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,
+			bus_well_info bwi,
+      bus_device_well bdw
+      WHERE  bd.DEVICE_TYPE='16'
+      AND   bdw.WELL_ID=bwi.ID
+      AND  bdw.DEVICE_ID = bd.ID
+	  GROUP BY   WELL_FLAG_1
+    </select>
+
+    <select id="groupDeviceListPage" resultType="MAP">
+       SELECT    bd.DEVCODE,bd.DEVICE_NAME,bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",
+                  RESPONSIBLE_DEPT AS  "responsibleDept",STAFF AS staff,TEL AS "tel",
+                  WELL_FLAG_1 AS  "groupId",DEPTID as  deptid
         FROM  bus_well_info  bwi,
         bus_device_well   bdw,
         bus_device  bd
-        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,UPTIME
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1='1'
+		GROUP BY  bd.DEVCODE
+    </select>
+
+    <select id="dataTubeByDevcode" resultType="MAP">
+        SELECT DEVCODE AS devcode,STRENGTH AS strength,
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime,
+        pci,rsrp,snr,cell,ID AS "tubeId"
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        ORDER BY UPTIME desc
+        LIMIT 1
+    </select>
+
+    <select id="tubeDataHistory" resultType="MAP">
+        SELECT ID as id ,WELL_CODE as "wellCode",DEVCODE as "devcode",CELL AS "cell",STRENGTH AS "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime ,pci,rsrp,snr
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        <choose>
+            <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                AND UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+                AND UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </when>
+            <otherwise>
+                <include refid="data_diff">
+                    <property name="paramDay" value="7"/>
+                </include>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="groupDeviceList" resultType="MAP">
+        SELECT   bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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,STRENGTH AS strength,data_tube_id
+        FROM  bus_well_info  bwi,
+        bus_device_well   bdw,
+        bus_device  bd
+        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
         FROM    data_tube
-        WHERE    <include refid="data_diff"/>
-        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " +
-        WHERE  bd.DEVICE_TYPE='16' " +
-        AND   bwi.WELL_FLAG_1=#{wellGroupId}" +
+        WHERE   datediff(now(),UPTIME) <![CDATA[<= ]]> 3
+        AND  datediff(now(),UPTIME) <![CDATA[>= ]]> 0
+        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1=#{wellGroupId}
         AND   bdw.WELL_ID=bwi.ID
         AND   bd.ID=bdw.DEVICE_ID
     </select>
 
     <select id="deviceDetail" resultType="MAP">
-        SELECT  *
-        FROM  data_tube
-        WHERE id=#{id}
+        SELECT dt.ID as id ,dt.WELL_CODE as "wellCode",dt.DEVCODE as "devcode",dt.CELL AS "cell",dt.STRENGTH AS
+        "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>  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"
+        FROM data_tube dt,
+        bus_well_info bwi,
+        bus_device_well bdw,
+        bus_device bd
+        WHERE dt.id=#{id}
+        AND bdw.WELL_ID=bwi.ID
+        AND bdw.DEVICE_ID = bd.ID
+        AND bd.DEVCODE=dt.DEVCODE
     </select>
 
-
 </mapper>
\ No newline at end of file
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 e30fa7f..d676ea2 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
@@ -171,14 +171,6 @@
         return responseData;
     }
 
-    private void sortStrength(List<Map<String, Object>> lstMap) {
-        Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
-            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                return o1.get("strength").toString().compareTo(o2.get("strength").toString());
-            }
-        });
-    }
-
     private void initTubeDeviceData(Map<String, Object> tubeDeviceData, Object devcode) {
         tubeDeviceData.put("deviceCode", devcode);
         tubeDeviceData.put("strength", -1);
@@ -191,6 +183,14 @@
         tubeDeviceData.put("id", "");
     }
 
+    private void sortStrength(List<Map<String, Object>> lstMap) {
+        Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                return o1.get("strength").toString().compareTo(o2.get("strength").toString());
+            }
+        });
+    }
+
     private void resvertSortStrength(List<Map<String, Object>> lstMap) {
         Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
             public int compare(Map<String, Object> o1, Map<String, Object> o2) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index e4888e4..07af8c9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -147,8 +147,9 @@
 
     @Override
     public List<Map<String, Object>> jobInfo(Long id, DataScope dataScope, Long personId) {
-        List<Map<String, Object>> job = this.baseMapper.jobInfo(id, dataScope, personId);
-        return job;
+        List<Map<String, Object>> jobList = this.baseMapper.jobInfo(id, dataScope, personId);
+        jobList.forEach(job -> job.put("editable", job.get("jobBelongTo") != null && job.get("jobBelongTo").toString().equals(personId) ? 1 : 0));
+        return jobList;
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 9d5d9e2..d1c7b27 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -1028,14 +1028,11 @@
         aj.HANDLE_PHOTOS AS "handlePhotos",
         aj.JOB_FLAG_1 AS "jobFlag",
         coalesce(aj.FLOW,'') AS flow,
-        bwi.RESPONSIBLE_DEPT AS deptid,
-        aj.JOB_BELONG_TO AS editable
+        bwi.RESPONSIBLE_DEPT AS deptid
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON aj.ID = ar.JOB_ID
         LEFT JOIN bus_well_info bwi ON aj.well_code = bwi.well_code
-
         WHERE aj.ID = ar.JOB_ID and aj.id = #{id}
-        AND aj.JOB_BELONG_TO =#{personId}
         ORDER BY ar.ID DESC LIMIT 1
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index f4dac57..8e00943 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -145,7 +145,7 @@
         //设备类型列表查询
         QueryWrapper<DeviceModels> query = new QueryWrapper<>();
         if (StrUtil.isNotEmpty(deviceType)) {
-            query.eq(DEVICE_QUERY_DEVICE_TYPE, deviceType);
+            query.eq(DEVICE_QUERY_DEVICE_TYPE, Long.valueOf(deviceType));
         }
         List<DeviceModels> list = deviceModelsService.list(query);
         List<DeviceSelectDto> selectDtos = new ArrayList<>();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
index d7d2c4f..53359ac 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java
@@ -58,7 +58,7 @@
             isValid = "";
         }
         QueryWrapper<DeviceType> query = new QueryWrapper<DeviceType>()
-                .like("TYPE_NAME", deviceType).like("VALID", isValid);
+                .eq("TYPE_NAME", deviceType).like("VALID", isValid);
         page = deviceTypeService.page(page, query);
         return new SuccessResponseData(super.packForBT(page));
     }
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 a8e0b37..2367d94 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
@@ -3,49 +3,152 @@
 <mapper namespace="com.casic.missiles.modular.system.dao.DeviceTubeMapper">
 
     <sql id="data_diff" databaseId="mysql">
-         and datediff(now(),UPTIME) <![CDATA[< ]]> 3
+         and datediff(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="pgsql">
-        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]> 3
+        AND date_part('day',now(),UPTIME)   <![CDATA[< ]]>  ${paramDay}
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),UPTIME) <![CDATA[< ]]>  3
+         and date_part(now(),UPTIME) <![CDATA[< ]]>  ${paramDay}
     </sql>
 
+    <sql id="char_toDate" databaseId="mysql">
+       str_to_date(${paramStr},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="char_toDate" databaseId="pgsql">
+        TO_DATE(${paramStr},'yyyy-MM-dd HH24:mi')
+    </sql>
+
+    <sql id="char_toDate" databaseId="oracle">
+        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="mysql">
+       DATE_FORMAT(${paramTime},'%Y-%m-%d %H:%i')
+    </sql>
+
+    <sql id="date_toChar" databaseId="pgsql">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
+
+    <sql id="date_toChar" databaseId="oracle">
+       TO_CHAR(${paramTime},'yyyy-mm-dd hh24:mi')
+    </sql>
 
     <select id="deviceList" resultType="MAP">
-      SELECT  *
+      SELECT  bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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
       FROM  bus_well_info  bwi,
       bus_device_well   bdw,
-      bus_device  bd  " +
+      bus_device  bd
       WHERE  bd.DEVICE_TYPE='16'
-      AND   bwi.WELL_FLAG_1='1'
       AND   bdw.WELL_ID=bwi.ID
       AND   bd.ID=bdw.DEVICE_ID
     </select>
 
-    <select id="deviceList" resultType="MAP">
-        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,
+			bus_well_info bwi,
+      bus_device_well bdw
+      WHERE  bd.DEVICE_TYPE='16'
+      AND   bdw.WELL_ID=bwi.ID
+      AND  bdw.DEVICE_ID = bd.ID
+	  GROUP BY   WELL_FLAG_1
+    </select>
+
+    <select id="groupDeviceListPage" resultType="MAP">
+       SELECT    bd.DEVCODE,bd.DEVICE_NAME,bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",
+                  RESPONSIBLE_DEPT AS  "responsibleDept",STAFF AS staff,TEL AS "tel",
+                  WELL_FLAG_1 AS  "groupId",DEPTID as  deptid
         FROM  bus_well_info  bwi,
         bus_device_well   bdw,
         bus_device  bd
-        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,UPTIME
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1='1'
+		GROUP BY  bd.DEVCODE
+    </select>
+
+    <select id="dataTubeByDevcode" resultType="MAP">
+        SELECT DEVCODE AS devcode,STRENGTH AS strength,
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime,
+        pci,rsrp,snr,cell,ID AS "tubeId"
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        ORDER BY UPTIME desc
+        LIMIT 1
+    </select>
+
+    <select id="tubeDataHistory" resultType="MAP">
+        SELECT ID as id ,WELL_CODE as "wellCode",DEVCODE as "devcode",CELL AS "cell",STRENGTH AS "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>
+        AS uptime ,pci,rsrp,snr
+        FROM data_tube
+        WHERE DEVCODE=#{devcode}
+        <choose>
+            <when test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+                AND UPTIME <![CDATA[ >= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{beginTime}"/>
+                </include>
+                AND UPTIME <![CDATA[ <= ]]>
+                <include refid="char_toDate">
+                    <property name="paramStr" value="#{endTime}"/>
+                </include>
+            </when>
+            <otherwise>
+                <include refid="data_diff">
+                    <property name="paramDay" value="7"/>
+                </include>
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="groupDeviceList" resultType="MAP">
+        SELECT   bwi.WELL_CODE  AS  "wellCode",WELL_NAME AS  "wellName",DEEP AS  deep,
+                  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,STRENGTH AS strength,data_tube_id
+        FROM  bus_well_info  bwi,
+        bus_device_well   bdw,
+        bus_device  bd
+        LEFT JOIN  (SELECT   DEVCODE,STRENGTH,id  as  data_tube_id,DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime
         FROM    data_tube
-        WHERE    <include refid="data_diff"/>
-        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE " +
-        WHERE  bd.DEVICE_TYPE='16' " +
-        AND   bwi.WELL_FLAG_1=#{wellGroupId}" +
+        WHERE   datediff(now(),UPTIME) <![CDATA[<= ]]> 3
+        AND  datediff(now(),UPTIME) <![CDATA[>= ]]> 0
+        GROUP BY  DEVCODE, STRENGTH,id,UPTIME) dzt ON dzt.DEVCODE=bd.DEVCODE
+        WHERE  bd.DEVICE_TYPE='16'
+        AND   bwi.WELL_FLAG_1=#{wellGroupId}
         AND   bdw.WELL_ID=bwi.ID
         AND   bd.ID=bdw.DEVICE_ID
     </select>
 
     <select id="deviceDetail" resultType="MAP">
-        SELECT  *
-        FROM  data_tube
-        WHERE id=#{id}
+        SELECT dt.ID as id ,dt.WELL_CODE as "wellCode",dt.DEVCODE as "devcode",dt.CELL AS "cell",dt.STRENGTH AS
+        "stregnth",
+        <include refid="date_toChar">
+            <property name="paramTime" value="UPTIME"/>
+        </include>  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"
+        FROM data_tube dt,
+        bus_well_info bwi,
+        bus_device_well bdw,
+        bus_device bd
+        WHERE dt.id=#{id}
+        AND bdw.WELL_ID=bwi.ID
+        AND bdw.DEVICE_ID = bd.ID
+        AND bd.DEVCODE=dt.DEVCODE
     </select>
 
-
 </mapper>
\ No newline at end of file
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 e30fa7f..d676ea2 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
@@ -171,14 +171,6 @@
         return responseData;
     }
 
-    private void sortStrength(List<Map<String, Object>> lstMap) {
-        Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
-            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
-                return o1.get("strength").toString().compareTo(o2.get("strength").toString());
-            }
-        });
-    }
-
     private void initTubeDeviceData(Map<String, Object> tubeDeviceData, Object devcode) {
         tubeDeviceData.put("deviceCode", devcode);
         tubeDeviceData.put("strength", -1);
@@ -191,6 +183,14 @@
         tubeDeviceData.put("id", "");
     }
 
+    private void sortStrength(List<Map<String, Object>> lstMap) {
+        Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                return o1.get("strength").toString().compareTo(o2.get("strength").toString());
+            }
+        });
+    }
+
     private void resvertSortStrength(List<Map<String, Object>> lstMap) {
         Collections.sort(lstMap, new Comparator<Map<String, Object>>() {
             public int compare(Map<String, Object> o1, Map<String, Object> o2) {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index 2c569f1..cf88b33 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -75,7 +75,7 @@
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isNumeric(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;