diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 3f61dd4..5374e8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -77,6 +77,10 @@
      * 燃气数据查询
      */
     List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 管盯数据查询
+     */
+    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 3f61dd4..5374e8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -77,6 +77,10 @@
      * 燃气数据查询
      */
     List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 管盯数据查询
+     */
+    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
new file mode 100644
index 0000000..4396fd3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
@@ -0,0 +1,341 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.response.SuccessResponseData;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import org.apache.commons.lang.StringUtils;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-16
+ */
+@Service
+public class BusTubeConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+    @Autowired
+    private RedisCommon redisCommon;
+
+    @Autowired
+    private IDeviceService iDeviceService;
+    @Autowired
+    private IDeviceRuleService iDeviceRuleService;
+    @Autowired
+    private DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        EntityWrapper<BusConfig> busConfigEntityWrapper = new EntityWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.deleteById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                + busConfigDTO.getUploadPeriod() + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        insert(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                deleteById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            insert(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StringUtils.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StringUtils.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = selectById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.selectById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Liquid.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getUploadPeriod())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，上传周期必填且为正整数");
+                    return stringMap;
+
+                }
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getCollectInterval())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数");
+                    return stringMap;
+                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(MultipartFile uploadFile) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        try {
+            try (InputStream in = uploadFile.getInputStream()) {
+                try {
+                    ExcelIO.read(in, mapper, BusConfigDTO.class, (row) -> {
+                        if (row.getSheet() == 0) {
+                            busConfigDTOList.add(row.getResult());
+                        } else {
+                            row.shutdown();
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    resultData.setCode(400);
+                    resultData.setMessage("导入失败");
+                }
+            }
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            if (ToolUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            ExcelIO.writeTemplate(fis, response.getOutputStream(), var);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 3f61dd4..5374e8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -77,6 +77,10 @@
      * 燃气数据查询
      */
     List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 管盯数据查询
+     */
+    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
new file mode 100644
index 0000000..4396fd3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
@@ -0,0 +1,341 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.response.SuccessResponseData;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import org.apache.commons.lang.StringUtils;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-16
+ */
+@Service
+public class BusTubeConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+    @Autowired
+    private RedisCommon redisCommon;
+
+    @Autowired
+    private IDeviceService iDeviceService;
+    @Autowired
+    private IDeviceRuleService iDeviceRuleService;
+    @Autowired
+    private DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        EntityWrapper<BusConfig> busConfigEntityWrapper = new EntityWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.deleteById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                + busConfigDTO.getUploadPeriod() + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        insert(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                deleteById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            insert(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StringUtils.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StringUtils.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = selectById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.selectById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Liquid.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getUploadPeriod())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，上传周期必填且为正整数");
+                    return stringMap;
+
+                }
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getCollectInterval())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数");
+                    return stringMap;
+                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(MultipartFile uploadFile) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        try {
+            try (InputStream in = uploadFile.getInputStream()) {
+                try {
+                    ExcelIO.read(in, mapper, BusConfigDTO.class, (row) -> {
+                        if (row.getSheet() == 0) {
+                            busConfigDTOList.add(row.getResult());
+                        } else {
+                            row.shutdown();
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    resultData.setCode(400);
+                    resultData.setMessage("导入失败");
+                }
+            }
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            if (ToolUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            ExcelIO.writeTemplate(fis, response.getOutputStream(), var);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 010c02b..9e279da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -316,6 +316,14 @@
         }
         return mapList;
     }
+    @Override
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
 
     @Override
     public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 3f61dd4..5374e8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -77,6 +77,10 @@
      * 燃气数据查询
      */
     List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 管盯数据查询
+     */
+    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
new file mode 100644
index 0000000..4396fd3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
@@ -0,0 +1,341 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.response.SuccessResponseData;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import org.apache.commons.lang.StringUtils;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-16
+ */
+@Service
+public class BusTubeConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+    @Autowired
+    private RedisCommon redisCommon;
+
+    @Autowired
+    private IDeviceService iDeviceService;
+    @Autowired
+    private IDeviceRuleService iDeviceRuleService;
+    @Autowired
+    private DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        EntityWrapper<BusConfig> busConfigEntityWrapper = new EntityWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.deleteById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                + busConfigDTO.getUploadPeriod() + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        insert(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                deleteById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            insert(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StringUtils.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StringUtils.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = selectById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.selectById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Liquid.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getUploadPeriod())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，上传周期必填且为正整数");
+                    return stringMap;
+
+                }
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getCollectInterval())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数");
+                    return stringMap;
+                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(MultipartFile uploadFile) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        try {
+            try (InputStream in = uploadFile.getInputStream()) {
+                try {
+                    ExcelIO.read(in, mapper, BusConfigDTO.class, (row) -> {
+                        if (row.getSheet() == 0) {
+                            busConfigDTOList.add(row.getResult());
+                        } else {
+                            row.shutdown();
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    resultData.setCode(400);
+                    resultData.setMessage("导入失败");
+                }
+            }
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            if (ToolUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            ExcelIO.writeTemplate(fis, response.getOutputStream(), var);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 010c02b..9e279da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -316,6 +316,14 @@
         }
         return mapList;
     }
+    @Override
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
 
     @Override
     public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index e40970a..dcc5bff 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -448,8 +448,9 @@
                deviceTypeName,
                wellId,
                deptid,
+               deptName,
                wellCode,
-               POSITION as postion,
+               POSITION as position,
                onlineState,
                coordinateX,
                coordinateY,

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
index 043e3b8..122ebba 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java
@@ -41,6 +41,10 @@
     @Autowired
     private IBusConfigService busMethaneConfigService;
 
+    @Qualifier("busTubeConfigServiceImpl")
+    @Autowired
+    private IBusConfigService busTubeConfigService;
+
     @Qualifier("busWasteGasConfigServiceImpl")
     @Autowired
     private IBusConfigService busWasteGasConfigService;
@@ -137,6 +141,31 @@
         return successResult;
     }
 
+
+    /**
+     * 燃气获取配置列表
+     */
+    @RequestMapping(value = "/tubeConfig/list")
+    @ResponseBody
+    public Object tubeConfigList(@RequestParam(required = false) String keywords,
+                                    @RequestParam(required = false) String deptid) {
+        SuccessResponseData successResult = new SuccessResponseData();
+        try {
+            Page<BusConfigDTO> page = new PageFactory<BusConfigDTO>().defaultPage();//page使用
+            DataScope dataScope = service.getCurrUserDataScope();
+            List<BusConfigDTO> busConfigDTOList = busTubeConfigService.getConfigList(page, keywords,
+                    deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope);
+            page.setRecords(busConfigDTOList);
+            successResult.setData(super.packForBT(page));
+            successResult.setMessage("success");
+        } catch (Exception e) {
+            e.printStackTrace();
+            successResult.setCode(500);
+            successResult.setMessage("false");
+        }
+        return successResult;
+    }
+
     /**
      * 温湿度获取配置列表
      */
@@ -242,6 +271,23 @@
         return ResponseData.success();
     }
 
+
+    /**
+     * 新增管盯配置
+     */
+    @RequestMapping(value = "/tubeConfig/config")
+    @ResponseBody
+    @BussinessLog(value = "新增管盯配置", key = "deviceId,uploadPeriod,collectInterval,retryTimes,attemptsMax,ip,port", dict = BusConfigDict.class)
+    public Object addTube(BusConfigDTO busConfigDTO) {
+        try {
+            busTubeConfigService.addConfig(busConfigDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseData.error(ResponseData.DEFAULT_ERROR_CODE, "配置失败");
+        }
+        return ResponseData.success();
+    }
+
     /**
      * 新增有害配置
      */
@@ -359,6 +405,25 @@
         return resultData;
     }
 
+    /****
+     * 管盯配置批量导入
+     * @param uploadFile
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/tubeConfig/batchImport", method = RequestMethod.POST)
+    @ResponseBody
+    public Object uploadTubeConfig(@RequestParam("file") MultipartFile uploadFile) throws Exception {
+        SuccessResponseData resultData = new SuccessResponseData();
+        if (null == uploadFile) {
+            resultData.setCode(400);
+            resultData.setMessage("上传失败，无法找到文件！");
+            return resultData;
+        }
+        resultData = busTubeConfigService.imp(uploadFile);
+        return resultData;
+    }
+
 
     /****
      * 有害配置批量导入
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
index 5b8160c..7a159f6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WellDataController.java
@@ -122,6 +122,32 @@
         return ResponseData.success(super.packForBT(page));
     }
 
+    @ApiOperation("管盯数据查询")
+    @GetMapping(value = "/tubedata/list")
+    //@Permission
+    public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime){
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        page.setRecords(mapList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+    @ApiOperation("管盯数据导出")
+    @GetMapping(value = "/tubedata/export")
+    //@Permission
+    public void tubeDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException{
+        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
+        page.setCurrent(1);
+        page.setSearchCount(false);
+        page.setSize(Integer.MAX_VALUE);
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<Map<String,Object>> mapList = deviceService.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        super.exportExcel(DeviceExportEnum.TUBEDATA_EXPORT, mapList, response);
+    }
+
     @ApiOperation("燃气数据导出")
     @GetMapping(value = "/gasdata/export")
     //@Permission
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index e9f3877..de7f150 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -32,6 +32,8 @@
 
     List<Map<String, Object>> selectGasDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
+    List<Map<String, Object>> selectTubeDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
+
     List<Map<String, Object>> selectHarmfulDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
 
     List<Map<String, Object>> selectTempDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<Map<String,Object>> page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 928baef..3de0ee0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -221,6 +221,50 @@
         ORDER BY dg.UPTIME DESC
     </select>
 
+
+
+    <select id="selectTubeDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+        SELECT
+        dg.DEVCODE AS devcode ,
+        bd.DEVICE_TYPE AS deviceType,
+        bdt.TYPE_NAME AS deviceTypeName,
+        bwi.DEPTID AS deptid,
+        dg.WELL_CODE AS wellCode,
+        dg.DESCN AS descn,
+        dg.CELL AS cell,
+        DATE_FORMAT(dg.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime,
+        DATE_FORMAT(dg.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime,
+        dg.STRENGTH AS strength
+        FROM
+        data_tube dg
+        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
+        <where>
+            bd.VALID = '1' AND bwi.VALID = '1'
+            <if test="deptid != null and deptid !=''">
+                and bwi.DEPTID = #{deptid}
+            </if>
+            <if test="beginTime != null and beginTime != '' ">
+                and dg.UPTIME &gt;<include refid="begintime_sql"/>
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and dg.UPTIME &lt;
+                <include refid="endtime_sql"/>
+            </if>
+            <if test="keywords != null and keywords !=''">
+                and (dg.DEVCODE like
+                <include refid="keywords_sql"/>
+                OR dg.WELL_CODE LIKE
+                <include refid="keywords_sql"/>
+                )
+            </if>
+        </where>
+        ORDER BY dg.UPTIME DESC
+    </select>
+
+
+
     <select id="selectHarmfulDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
         SELECT
             dhg.DEVCODE AS devcode,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
index 69c25cf..7f760f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/BusConfigDTO.java
@@ -45,6 +45,7 @@
     {//根据前期产品化文档，配置时存入config表中对应的sensorid字段，区分是哪类设备
         sensorHashMap.put(DeviceTypeEnum.Liquid.getIndex(), "000034");
         sensorHashMap.put(DeviceTypeEnum.Methane.getIndex(), "000044");
+        sensorHashMap.put(DeviceTypeEnum.Tube.getIndex(), "000080");
         sensorHashMap.put(DeviceTypeEnum.WasteGas.getIndex(), "000035");
         sensorHashMap.put(DeviceTypeEnum.TempHumi.getIndex(), "000055");
         sensorHashMap.put(DeviceTypeEnum.Dig.getIndex(), "000064");
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
index f17d5ee..c306ad6 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceTypeEnum.java
@@ -16,7 +16,8 @@
     FireHydrant("消防栓防盗水监测仪", 12),
     Concentrator("数据集中器", 13),
     Noise("噪声记录仪", 14),
-    LG("燃气智能监测终端(一体化)", 15);
+    LG("燃气智能监测终端(一体化)", 15),
+    Tube("管盯", 16);
 
     // 成员变量
     private String name;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
index 14bc00b..cfa80d4 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java
@@ -9,6 +9,7 @@
     WELLDATA_EXPORT("wellCoverData.xlsx", "wellCoverData.xlsx", "井盖查询数据"),
     LIQUIDDATA_EXPORT("liquidData.xlsx", "liquidData.xlsx", "液位数据"),
     GASDATA_EXPORT("gasData.xlsx", "gasData.xlsx", "燃气数据"),
+    TUBEDATA_EXPORT("gasData.xlsx", "tubeData.xlsx", "管盯数据"),
     HARMFULDATA_EXPORT("harmfulData.xlsx","harmfulData.xlsx","有害气体数据"),
     TEMPDATA_EXPORT("tempData.xlsx","tempData.xlsx","温湿度数据"),
     TEMPPRESSDATA_EXPORT("tempPressData.xlsx","tempPressData.xlsx","压力数据"),
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
index ad4efb4..674239c 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/AbstractRequest.java
@@ -19,6 +19,7 @@
         abstractRequestHashMap.put(DeviceTypeEnum.Liquid.toString(), new LiquidRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Noise.toString(), new NoiseRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.Methane.toString(), new MethaneRequest());
+        abstractRequestHashMap.put(DeviceTypeEnum.Tube.toString(), new TubeRequest());
         abstractRequestHashMap.put(DeviceTypeEnum.WasteGas.toString(), new WasteGasRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.WaterMeter.toString(), new WaterMeterRequest());
 //        abstractRequestHashMap.put(DeviceTypeEnum.TempPressure.toString(), new TemPressureRequest());
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
new file mode 100644
index 0000000..7415e4e
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/TubeRequest.java
@@ -0,0 +1,34 @@
+package com.casic.missiles.modular.system.rs;
+
+
+import com.casic.missiles.core.util.SpringContextHolder;
+import com.casic.missiles.modular.system.dto.CommConfigDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by lenovo on 2018/1/9.
+ */
+public class TubeRequest extends AbstractRequest {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
+
+    @Override
+    public void send(String devCode, String content, String attemptsMax) {
+
+        RedisCommon  redisCommon = SpringContextHolder.getBean("redisCommon");
+        CommConfigDTO commConfigDTO = new CommConfigDTO();
+        commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0]));
+        commConfigDTO.setInterval(Long.valueOf(content.split(",")[1]));
+        commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2]));
+        if(StringUtils.isNotBlank(content.split(",",5)[3])){
+            commConfigDTO.setIp(content.split(",", 5)[3]);
+            commConfigDTO.setPort(Long.valueOf(content.split(",", 5)[4]));
+        }
+        redisCommon.setRedisConfig(devCode, commConfigDTO);
+        if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))
+            redisCommon.setRedisConcentrator(getConcentratorCode(), devCode, attemptsMax);
+    }
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index 3f61dd4..5374e8a 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -77,6 +77,10 @@
      * 燃气数据查询
      */
     List<Map<String,Object>> selectGasDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
+    /**
+     * 管盯数据查询
+     */
+    List<Map<String,Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords);
 
     /**
      * 有害气体数据查询
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
new file mode 100644
index 0000000..4396fd3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java
@@ -0,0 +1,341 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.config.DeviceServerProperties;
+import com.casic.missiles.core.base.response.SuccessResponseData;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.constant.DeviceConfigConst;
+import com.casic.missiles.modular.system.dao.BusConfigMapper;
+import com.casic.missiles.modular.system.dto.BusConfigDTO;
+import com.casic.missiles.modular.system.dto.DeviceTypeEnum;
+import com.casic.missiles.modular.system.model.BusConfig;
+import com.casic.missiles.modular.system.model.Device;
+import com.casic.missiles.modular.system.redis.RedisPublisherUtil;
+import com.casic.missiles.modular.system.rs.RedisCommon;
+import com.casic.missiles.modular.system.service.IBusConfigService;
+import com.casic.missiles.modular.system.service.IDeviceRuleService;
+import com.casic.missiles.modular.system.service.IDeviceService;
+import com.casic.missiles.util.RegUtil;
+import org.apache.commons.lang.StringUtils;
+import org.hswebframework.expands.office.excel.ExcelIO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.*;
+
+/**
+ * <p>
+ * 设备配置表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2019-05-16
+ */
+@Service
+public class BusTubeConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
+    @Autowired
+    private RedisCommon redisCommon;
+
+    @Autowired
+    private IDeviceService iDeviceService;
+    @Autowired
+    private IDeviceRuleService iDeviceRuleService;
+    @Autowired
+    private DeviceServerProperties deviceServerProperties;
+
+    @Override
+    public List<BusConfig> getListBydevId(Long devId) {
+        EntityWrapper<BusConfig> busConfigEntityWrapper = new EntityWrapper<>();
+        busConfigEntityWrapper.eq("DEVICE_ID", devId);
+        return this.baseMapper.selectList(busConfigEntityWrapper);
+    }
+
+    public String getThresholdByDevId(BusConfigDTO busConfigDTO) {
+        String limitValue = "0";//报警阈值
+        limitValue = getWellDeepByDevId(busConfigDTO.getDeviceId());
+        DecimalFormat df = new DecimalFormat("0.000");
+        limitValue = df.format(Double.parseDouble(limitValue) *
+                Double.valueOf(busConfigDTO.getPercent()) / 100);
+        return limitValue;
+    }
+
+    @Override
+    public List<BusConfigDTO> getConfigList(Page<BusConfigDTO> page,
+                                            String keywords,
+                                            String deptid,
+                                            Long deviceType,
+                                            DataScope dataScope) {
+        List<Map<String, Object>> result = this.baseMapper.getConfigList(page, keywords, deptid,
+                BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope);
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        for (Map<String, Object> objectMap : result) {
+            BusConfigDTO dto = BusConfigDTO.ConvertDTO(objectMap);
+            String framecontent = objectMap.get("framecontent").toString();
+            if (null != framecontent) {
+                String[] configItems = framecontent.split(",");
+                dto.setRetryTimes(configItems[0]);
+                dto.setCollectInterval(configItems[1]);
+                dto.setUploadPeriod(configItems[2]);
+                if (configItems.length == 5) {
+                    dto.setIp(configItems[3]);
+                    dto.setPort(configItems[4]);
+                }
+            }
+            busConfigDTOList.add(dto);
+        }
+        return busConfigDTOList;
+
+    }
+
+
+    @Override
+    public String getConcenCodeByDevId(Long devID) {
+        return this.baseMapper.getConcenCodeByDevId(devID);
+    }
+
+    @Override
+    public String getWellDeepByDevId(Long devID) {
+        return this.baseMapper.getWellDeepByDevId(devID);
+    }
+
+    @Transactional
+    @Override
+    public void addConfig(BusConfigDTO busConfigDTO) {
+        List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+        busConfigList.forEach(busConfig -> {
+            this.deleteById(busConfig.getId());
+        });
+        busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+        BusConfig busConfig = new BusConfig(busConfigDTO);
+        String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                + busConfigDTO.getUploadPeriod() + ","
+                + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+        busConfig.setFramecontent(str);
+        insert(busConfig);
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    @Transactional
+    public void addBatchConfig(List<BusConfigDTO> busConfigDTOList) {
+        String concentratorCodeStr = "";
+        for (BusConfigDTO busConfigDTO : busConfigDTOList) {
+            List<BusConfig> busConfigList = getListBydevId(busConfigDTO.getDeviceId());
+            for (BusConfig busConfig : busConfigList) {
+                deleteById(busConfig.getId());
+            }
+            busConfigDTO.setDeviceType(Long.valueOf(DeviceTypeEnum.Tube.getIndex()));
+            BusConfig busConfig1 = new BusConfig(busConfigDTO);
+            String str = busConfigDTO.getRetryTimes() + "," + busConfigDTO.getCollectInterval() + ","
+                    + busConfigDTO.getUploadPeriod() + ","
+                    + busConfigDTO.getIp() + "," + busConfigDTO.getPort();//按照重传次数、采集间隔、上传周期
+            busConfig1.setFramecontent(str);
+            insert(busConfig1);
+            String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Tube.toString(),
+                    busConfig1.getDeviceId(), busConfig1.getFramecontent(), busConfigDTO.getAttemptsMax());
+            if (StringUtils.isNotBlank(concentratorCode)) {
+                concentratorCodeStr += (concentratorCode + ",");
+            }
+        }
+        if (StringUtils.isNotBlank(concentratorCodeStr)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCodeStr.substring(0, concentratorCodeStr.length() - 1));
+        }
+    }
+
+    @Override
+    public void updateConfig(BusConfigDTO busConfigDTO) {
+        busConfigDTO.setThreshold(Float.valueOf(getThresholdByDevId(busConfigDTO)));
+        BusConfig busConfig = selectById(busConfigDTO.getId());
+        busConfig.setDeviceId(Long.valueOf(busConfigDTO.getDeviceId()));
+        busConfig.setFramecontent(busConfigDTO.getThreshold() + "," + busConfigDTO.getInstallHeight() + ","
+                + busConfigDTO.getRetryTimes() + "," + busConfigDTO.getPercent() + "," + busConfigDTO.getIp() + ","
+                + busConfigDTO.getPort());
+        busConfig.setStatus("0");
+        busConfig.setAttemptsmax(Integer.valueOf(busConfigDTO.getAttemptsMax()));
+        busConfig.setWritetime(new Date());
+        updateById(busConfig);
+        Device device = iDeviceService.selectById(busConfigDTO.getDeviceId());
+        if (device != null) {
+            iDeviceRuleService.updateRule(device.getDevcode(), busConfigDTO.getThreshold(), null);
+        }
+        String concentratorCode = redisCommon.sendMsg(DeviceTypeEnum.Liquid.toString(),
+                busConfig.getDeviceId(), busConfig.getFramecontent(), busConfigDTO.getAttemptsMax());
+        if (StringUtils.isNotBlank(concentratorCode)) {//发布消息订阅
+            RedisPublisherUtil.getInstance().
+                    publishMessage(concentratorCode);
+        }
+    }
+
+    public Map<String, Object> validate(List<BusConfigDTO> busConfigDTOList) {
+        Map<String, Object> stringMap = new HashMap<>();
+        try {
+            for (int i = 0; i < busConfigDTOList.size(); i++) {
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getUploadPeriod())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，上传周期必填且为正整数");
+                    return stringMap;
+
+                }
+                if (!RegUtil.isNumOrLetter(busConfigDTOList.get(i).getDevcode())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，设备编号必填且为字母或数字");
+                    return stringMap;
+                } else {//校验设备编号是否在系统中存在
+                    Device device = iDeviceService.getDeviceByDevCode(
+                            busConfigDTOList.get(i).getDevcode());
+                    if (null == device) {
+                        stringMap.put("success", false);
+                        stringMap.put("msg", "第" + (i + 2) + "行，设备编号在系统中不存在，请先导入设备");
+                        return stringMap;
+                    } else {
+                        busConfigDTOList.get(i).setDeviceId(device.getId());
+                    }
+                }
+
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getRetryTimes())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，重传次数必填且为正整数");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getCollectInterval())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，采集间隔必填且为正整数");
+                    return stringMap;
+                }
+
+                if (!RegUtil.isIp(busConfigDTOList.get(i).getIp())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，IP填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isPort(busConfigDTOList.get(i).getPort())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，端口号填写不合格");
+                    return stringMap;
+                }
+                if (!RegUtil.isInteger(busConfigDTOList.get(i).getAttemptsMax())) {
+                    stringMap.put("success", false);
+                    stringMap.put("msg", "第" + (i + 2) + "行，最大尝试次数必填且为正整数");
+                    return stringMap;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            stringMap.put("success", false);
+            stringMap.put("msg", "导入异常！");
+        }
+        stringMap.put("success", true);
+        stringMap.put("msg", "导入成功");
+        return stringMap;
+    }
+
+    @Transactional
+    @Override
+    public SuccessResponseData imp(MultipartFile uploadFile) {
+        SuccessResponseData resultData = new SuccessResponseData();
+        Map<String, String> mapper = new HashMap<>();
+        mapper.put("设备编号", "devcode");
+        mapper.put("重传次数", "retryTimes");
+        mapper.put("上传周期（分）", "uploadPeriod");
+        mapper.put("采集间隔（分）", "collectInterval");
+        mapper.put("IP地址", "ip");
+        mapper.put("端口号", "port");
+        mapper.put("最大尝试次数", "attemptsMax");
+        List<BusConfigDTO> busConfigDTOList = new ArrayList<>();
+        try {
+            try (InputStream in = uploadFile.getInputStream()) {
+                try {
+                    ExcelIO.read(in, mapper, BusConfigDTO.class, (row) -> {
+                        if (row.getSheet() == 0) {
+                            busConfigDTOList.add(row.getResult());
+                        } else {
+                            row.shutdown();
+                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    resultData.setCode(400);
+                    resultData.setMessage("导入失败");
+                }
+            }
+            Map<String, Object> objectMap = this.validate(busConfigDTOList);
+            if ((Boolean) objectMap.get("success")) {//检验通过后写入
+                this.addBatchConfig(busConfigDTOList);
+                resultData.setCode(200);
+                resultData.setMessage(objectMap.get("msg").toString());
+            } else {//校验失败，返回
+                resultData.setCode(400);
+                resultData.setMessage(objectMap.get("msg").toString());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            resultData.setCode(400);
+            resultData.setMessage("导入失败");
+        }
+        return resultData;
+    }
+
+    @Override
+    public void exp(List<BusConfigDTO> busConfigDTOList, HttpServletResponse response) {
+        FileInputStream fis = null;
+        try {
+            response.setContentType("application/octet-stream");
+            response.addHeader("Content-Disposition", " attachment;filename=".concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            if (ToolUtil.isEmpty(busConfigDTOList)) {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.CONFIG_EXPORT_EMPTY_TEMP));
+            } else {
+                fis = new FileInputStream(deviceServerProperties.getExportPath().concat(DeviceConfigConst.METHANE_CONFIG_EXPORT_TEMP));
+            }
+            Map<String, Object> var = new HashMap<>();
+            var.put("list", new ArrayList<Object>() {
+                {
+                    for (int i = 0; i < busConfigDTOList.size(); i++) {
+                        BusConfigDTO busConfigDTO = busConfigDTOList.get(i);
+                        add(new HashMap<String, Object>() {
+                            {
+                                put("设备编号", busConfigDTO.getDevcode());
+                                put("重传次数", busConfigDTO.getRetryTimes());
+                                put("采集间隔", busConfigDTO.getCollectInterval());
+                                put("上传周期", busConfigDTO.getUploadPeriod());
+                                put("IP地址", busConfigDTO.getIp());
+                                put("端口", busConfigDTO.getPort());
+                                put("最大尝试次数", busConfigDTO.getAttemptsMax());
+                                put("已尝试次数", busConfigDTO.getAttemptsCurrent());
+                                put("下发状态", "1".equals(busConfigDTO.getStatus()) ? "已下发" : "未下发");
+                            }
+                        });
+                    }
+                }
+            });
+            //输出模板
+            ExcelIO.writeTemplate(fis, response.getOutputStream(), var);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().flush();
+                response.getOutputStream().close();
+                fis.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 010c02b..9e279da 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -316,6 +316,14 @@
         }
         return mapList;
     }
+    @Override
+    public List<Map<String, Object>> selectTubeDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
+        List<Map<String, Object>> mapList = this.baseMapper.selectTubeDataScopePage(dataScope,page,deptid,beginTime,endTime,keywords);
+        for (Map<String, Object> map : mapList) {
+            map.put("deptName",permissionService.getDeptName(Long.valueOf(map.get("deptid").toString())));
+        }
+        return mapList;
+    }
 
     @Override
     public List<Map<String, Object>> selectHarmfulDataScopePage(DataScope dataScope, Page<Map<String,Object>> page, String deptid, String beginTime, String endTime, String keywords) {
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index e40970a..dcc5bff 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -448,8 +448,9 @@
                deviceTypeName,
                wellId,
                deptid,
+               deptName,
                wellCode,
-               POSITION as postion,
+               POSITION as position,
                onlineState,
                coordinateX,
                coordinateY,
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/DeviceInfoDto.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/DeviceInfoDto.java
index 9670a04..2eb02fc 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/DeviceInfoDto.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dto/DeviceInfoDto.java
@@ -21,7 +21,7 @@
     private String lngBaidu;
     private String latGaode;
     private String lngGaode;
-    private String postion;
+    private String position;
     private List<DeviceDataDto> realtimeData;
 
 }