diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 40eded1..d5fc2e8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -543,4 +543,12 @@
     public List<BusDevice> getListByWellId(Long wellId) {
         return this.baseMapper.getListByWellId(wellId);
     }
+
+    @Override
+    public List<BusDevice> getListByProductId(Long productId) {
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PRODUCT_ID", productId);
+        queryWrapper.eq("VALID", "1");
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 40eded1..d5fc2e8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -543,4 +543,12 @@
     public List<BusDevice> getListByWellId(Long wellId) {
         return this.baseMapper.getListByWellId(wellId);
     }
+
+    @Override
+    public List<BusDevice> getListByProductId(Long productId) {
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PRODUCT_ID", productId);
+        queryWrapper.eq("VALID", "1");
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d29e59a..d13937d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -73,7 +73,7 @@
 
     @Override
     public Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
-
+        page.setOptimizeCountSql(false);
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
@@ -86,6 +86,20 @@
     }
 
     @Override
+    public Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
+        page.setOptimizeCountSql(false);
+        Page<BusLedgerPipe> pageList = this.baseMapper.monitorHazardPageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
+        List<BusLedgerPipe> busLedgerList = pageList.getRecords();
+        busLedgerList.forEach(busLedger -> {
+            busLedger.setOnState("1".equals(busLedger.getOnState()) ? "在用" : "备用"); // 在用状态字典值
+            busLedger.setDeptName(ObjectUtil.isNotEmpty(busLedger.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedger.getDeptid()) : ""); // 管理单位名称
+            busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
+            busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
+        });
+        return pageList;
+    }
+
+    @Override
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
@@ -133,6 +147,11 @@
         return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null));
     }
 
+    @Override
+    public List<Map<String, Object>> deviceHazardList() {
+        return this.baseMapper.deviceHazardList(commonServer.getDeptScopeIds(null));
+    }
+
     public List<Long> getDeptids() {
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         String scopeType = authUser.getScopeType();

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 40eded1..d5fc2e8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -543,4 +543,12 @@
     public List<BusDevice> getListByWellId(Long wellId) {
         return this.baseMapper.getListByWellId(wellId);
     }
+
+    @Override
+    public List<BusDevice> getListByProductId(Long productId) {
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PRODUCT_ID", productId);
+        queryWrapper.eq("VALID", "1");
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d29e59a..d13937d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -73,7 +73,7 @@
 
     @Override
     public Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
-
+        page.setOptimizeCountSql(false);
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
@@ -86,6 +86,20 @@
     }
 
     @Override
+    public Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
+        page.setOptimizeCountSql(false);
+        Page<BusLedgerPipe> pageList = this.baseMapper.monitorHazardPageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
+        List<BusLedgerPipe> busLedgerList = pageList.getRecords();
+        busLedgerList.forEach(busLedger -> {
+            busLedger.setOnState("1".equals(busLedger.getOnState()) ? "在用" : "备用"); // 在用状态字典值
+            busLedger.setDeptName(ObjectUtil.isNotEmpty(busLedger.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedger.getDeptid()) : ""); // 管理单位名称
+            busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
+            busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
+        });
+        return pageList;
+    }
+
+    @Override
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
@@ -133,6 +147,11 @@
         return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null));
     }
 
+    @Override
+    public List<Map<String, Object>> deviceHazardList() {
+        return this.baseMapper.deviceHazardList(commonServer.getDeptScopeIds(null));
+    }
+
     public List<Long> getDeptids() {
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         String scopeType = authUser.getScopeType();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
index 158e56c..a875e38 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
@@ -35,6 +35,7 @@
 
     @Override
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
+        page.setOptimizeCountSql(false);
         Page<BusLedger> pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request);
         List<BusLedger> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 40eded1..d5fc2e8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -543,4 +543,12 @@
     public List<BusDevice> getListByWellId(Long wellId) {
         return this.baseMapper.getListByWellId(wellId);
     }
+
+    @Override
+    public List<BusDevice> getListByProductId(Long productId) {
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PRODUCT_ID", productId);
+        queryWrapper.eq("VALID", "1");
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d29e59a..d13937d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -73,7 +73,7 @@
 
     @Override
     public Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
-
+        page.setOptimizeCountSql(false);
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
@@ -86,6 +86,20 @@
     }
 
     @Override
+    public Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
+        page.setOptimizeCountSql(false);
+        Page<BusLedgerPipe> pageList = this.baseMapper.monitorHazardPageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
+        List<BusLedgerPipe> busLedgerList = pageList.getRecords();
+        busLedgerList.forEach(busLedger -> {
+            busLedger.setOnState("1".equals(busLedger.getOnState()) ? "在用" : "备用"); // 在用状态字典值
+            busLedger.setDeptName(ObjectUtil.isNotEmpty(busLedger.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedger.getDeptid()) : ""); // 管理单位名称
+            busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
+            busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
+        });
+        return pageList;
+    }
+
+    @Override
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
@@ -133,6 +147,11 @@
         return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null));
     }
 
+    @Override
+    public List<Map<String, Object>> deviceHazardList() {
+        return this.baseMapper.deviceHazardList(commonServer.getDeptScopeIds(null));
+    }
+
     public List<Long> getDeptids() {
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         String scopeType = authUser.getScopeType();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
index 158e56c..a875e38 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
@@ -35,6 +35,7 @@
 
     @Override
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
+        page.setOptimizeCountSql(false);
         Page<BusLedger> pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request);
         List<BusLedger> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index 2b4a2e0..b09d6c1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -58,7 +58,7 @@
 
 
     //todo:同步清除缓存
-    @Cacheable(value = "wellCache", key = "#request.getSfq()")
+//    @Cacheable(value = "wellCache", key = "#request.getSfq()")
     @Override
     public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
index c2d9c30..a6701f9 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasServiceImpl.java
@@ -143,6 +143,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
index d58fdf1..f2ed864 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/data/service/impl/DataGasliquidGasServiceImpl.java
@@ -163,6 +163,9 @@
         for (int i = 0; i < jsonArray.size(); i++) {
             try {
                 String gas = ((JSONObject) jsonArray.get(i)).getString("gas");
+                if("40".equals(gas)||"60".equals(gas)||"40.0".equals(gas)||"60.0".equals(gas)){
+                    gas="0";
+                }
                 String upTime = ((JSONObject) jsonArray.get(i)).getString("uptime");
                 gas = String.format("%.2f", Double.valueOf(gas));
                 //1.存数据
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
index a992bc0..42d752d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BaseProductController.java
@@ -65,7 +65,7 @@
         Assert.isFalse(Objects.isNull(baseProduct.getId()), () -> {
             throw new BusinessException(BusinessExceptionEnum.ID_NULL);
         });
-        return ReturnUtil.success(iBaseProductService.updateById(baseProduct));
+        return ReturnUtil.success(iBaseProductService.updateBaseProductById(baseProduct));
     }
 
     @ApiOperation("批量删除")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
new file mode 100644
index 0000000..0be41f3
--- /dev/null
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusHazardMonitorController.java
@@ -0,0 +1,96 @@
+package com.casic.missiles.modular.device.controller;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.dto.ReturnDTO;
+import com.casic.missiles.enums.BusinessExceptionEnum;
+import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeDetailRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeMonitorRequestDTO;
+import com.casic.missiles.modular.device.dto.BusLedgerPipeResponseDTO;
+import com.casic.missiles.modular.device.dto.MonitorDataRequestDTO;
+import com.casic.missiles.modular.device.entity.BusLedgerPipe;
+import com.casic.missiles.modular.device.service.IBusLedgerPipeService;
+import com.casic.missiles.util.ReturnUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
+
+@Api(tags = "隐患监测模块")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/hazard")
+public class BusHazardMonitorController extends ExportController {
+
+    private final IBusLedgerPipeService iBusLedgerPipeService;
+
+
+    @ApiOperation("查询分页接口，列表用")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipe> listPage(@RequestBody BusLedgerPipeMonitorRequestDTO request) {
+        Page<BusLedgerPipe> page = PageFactory.defaultPage();
+        return ReturnUtil.success(super.packForBT(iBusLedgerPipeService.monitorHazardPageList(page, request)));
+    }
+
+    @ApiOperation("管线列表，地图用")
+    @PostMapping("/pipeList")
+    @ResponseBody
+    public ReturnDTO pipeList() {
+        return ReturnUtil.success(iBusLedgerPipeService.pipeList());
+    }
+
+    @ApiOperation("设备列表，地图用")
+    @PostMapping("/deviceList")
+    @ResponseBody
+    public ReturnDTO deviceList() {
+        return ReturnUtil.success(iBusLedgerPipeService.deviceHazardList());
+    }
+
+
+    @ApiOperation("详情")
+    @PostMapping("/detail")
+    @ResponseBody
+    public ReturnDTO<BusLedgerPipeResponseDTO> detail(@RequestBody BusLedgerPipeDetailRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getId()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.detail(requestDTO.getId(), requestDTO.getDevcode()));
+    }
+
+    //    @ApiOperation("查询接口，地图用")
+//    @PostMapping("/list")
+//    @ResponseBody
+//    public ReturnDTO<BusLedger> list(@RequestBody BusLedgerDTO request) {
+//        DataScope dataScope = iCommonPermissionService.getAuthService().getLoginUserDataScope();
+//        return ReturnUtil.success(wellMonitorService.list(request, dataScope));
+//    }
+//
+    @ApiOperation("查看监测数据")
+    @PostMapping("/watchDataByPipe")
+    @ResponseBody
+    public ReturnDTO watchDataByWell(@RequestBody MonitorDataRequestDTO requestDTO) {
+        Assert.isFalse(Objects.isNull(requestDTO.getDevcode()), () -> {
+            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+        });
+        return ReturnUtil.success(iBusLedgerPipeService.watchDataByPipe(requestDTO));
+    }
+
+    @ApiOperation("监控设备维护记录（待开发）")
+    @PostMapping("/repairLog")
+    @ResponseBody
+    public ReturnDTO repairLog(@RequestBody MonitorDataRequestDTO requestDTO) {
+//        Assert.isFalse(Objects.isNull(requestDTO.getWellId()), () -> {
+//            throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+//        });
+//        return ReturnUtil.success(wellMonitorService.repairLog(requestDTO));
+        return ReturnUtil.success();
+    }
+
+
+}
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
index d6d9743..afc800b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/controller/BusLedgerController.java
@@ -20,9 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Objects;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -39,8 +37,6 @@
 public class BusLedgerController extends ExportController {
 
     private final IBusLedgerService iBusLedgerService;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
 
     @ApiOperation("添加临时井")
     @PostMapping("/add")
@@ -109,8 +105,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllDept() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllDept();
                 }
         );
@@ -129,8 +124,7 @@
     @ResponseBody
     public ReturnDTO<Object> synAllLedger() {
 
-        threadPoolExecutor.execute(
-                () -> {
+        CompletableFuture.runAsync(() -> {
                     iBusLedgerService.synAllLedger();
                 }
         );
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
index 4123002..f8b6309 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BaseProductMapper.java
@@ -42,4 +42,7 @@
     @Select("SELECT id,DEVICE_TYPE as deviceType ,PRODUCT_CODE as productCode  FROM `base_product` WHERE PRODUCT_CODE =#{productCode} limit 1")
     BaseProduct getBaseProductByCode( @Param("productCode") String productCode);
 
+    @Select("SELECT DEVCODE FROM bus_device where valid>0 and PRODUCT_ID = ${productId}")
+    List<String> getDevCodesByProductId( @Param("productId") Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
index 5226b76..640d020 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/BusLedgerPipeMapper.java
@@ -28,6 +28,12 @@
                                             @Param("request") BusLedgerPipeMonitorRequestDTO request,
                                             @Param("deptStrs") String deptStrs);
 
+
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page,
+                                            @Param("request") BusLedgerPipeMonitorRequestDTO request,
+                                            @Param("deptStrs") String deptStrs);
+
+
     BusLedgerPipeResponseDTO detail(@Param("id") Long id,
                                     @Param("devcode") String devcode);
 
@@ -38,5 +44,7 @@
 
     List<Map<String, Object>> deviceList( @Param("deptids") String deptids);
 
+    List<Map<String, Object>> deviceHazardList( @Param("deptids") String deptids);
+
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
index dd0d56b..691c57b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusLedgerPipeMapper.xml
@@ -38,17 +38,19 @@
         bp.PRESS_TYPE,
         bm.NAME AS manufactureName
         FROM
-        `bus_ledger_pipe` blp
-        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
-        JOIN bus_device_ledger bdl ON bdl.LEDGER_ID = blp.ID
-        <!--AND bdl.TYPE = 3-->
-        AND bdl.VALID = 1
-        JOIN bus_device bd ON bd.ID = bdl.DEVICE_ID
-        AND bd.VALID = 1
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
         JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
-        left JOIN base_product bpt on bpt.ID = bd.PRODUCT_ID
-        LEFT JOIN bus_manufacturer bm on bm.ID = bpt.MANUFACTURER_ID
-        <where>
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY = 1
+        AND bd.VALID >0
+
             <if test="request.devCode != null and request.devCode !='' ">
                 and bd.DEVCODE like concat('%', #{request.devCode}, '%')
             </if>
@@ -80,7 +82,69 @@
             <if test="request.devTypeId != null and request.devTypeId !='' ">
                 and bt.ID =#{request.devTypeId}
             </if>
-        </where>
+
+        ORDER BY blp.TS DESC
+    </select>
+
+
+    <select id="monitorHazardPageList" resultType="com.casic.missiles.modular.device.entity.BusLedgerPipe">
+        SELECT
+        blp.*,
+        bd.DEVCODE,
+        bt.TYPE_NAME,
+        bp.CONSTRUCT_ERA,
+        bp.MATERIAL,
+        bp.PIPE_DIAMETER,
+        bp.PRESS_TYPE,
+        bm.NAME AS manufactureName
+        FROM
+        bus_device bd
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = bd.id
+        AND bl.VALID = 1
+        JOIN bus_ledger_pipe blp ON blp.id = bl.LEDGER_ID
+        AND bl.type = blp.type
+        JOIN base_device_type bt ON bt.ID = bd.DEVICE_TYPE
+        LEFT JOIN base_product bpt ON bpt.ID = bd.PRODUCT_ID
+        LEFT JOIN bus_manufacturer bm ON bm.ID = bpt.MANUFACTURER_ID
+        LEFT JOIN bus_pipeline bp ON blp.PIPE_CODE = bp.PIPE_CODE
+        WHERE
+        blp.LOCATION_CATEGORY > 1
+        AND bd.VALID >0
+        <if test="request.devCode != null and request.devCode !='' ">
+            and bd.DEVCODE like concat('%', #{request.devCode}, '%')
+        </if>
+        <if test="request.devName != null and request.devName !='' ">
+            and bd.DEVICE_NAME like concat('%', #{request.devName}, '%')
+        </if>
+        <if test="request.tagNumber != null and request.tagNumber !='' ">
+            and blp.TAG_NUMBER like concat('%', #{request.tagNumber}, '%')
+        </if>
+        <if test="deptStrs != null and deptStrs !='' ">
+            and blp.DEPTID in (${deptStrs})
+        </if>
+
+        <if test="request.pipeCode != null and request.pipeCode !='' ">
+            and blp.PIPE_CODE like concat('%', #{request.pipeCode}, '%')
+        </if>
+
+        <if test="request.position != null and request.position !='' ">
+            and blp.POSITION like concat('%', #{request.position}, '%')
+        </if>
+
+        <if test="request.onState != null and request.onState !='' ">
+            and blp.ON_STATE =#{request.onState}
+        </if>
+
+        <if test="request.monitorState != null and request.monitorState !='' ">
+            and blp.MONITOR_STATE =#{request.monitorState}
+        </if>
+        <if test="request.devTypeId != null and request.devTypeId !='' ">
+            and bt.ID =#{request.devTypeId}
+        </if>
+
+        <if test="request.locationCategory != null and request.locationCategory !='' ">
+            and blp.LOCATION_CATEGORY =#{request.locationCategory}
+        </if>
 
         ORDER BY blp.TS DESC
     </select>
@@ -88,6 +152,7 @@
 
         SELECT blp.*,
                bd.DEVCODE,
+               bd.INSTALL_DATE,
                bt.TYPE_NAME,
                bp.CONSTRUCT_ERA,
                bp.MATERIAL,
@@ -131,20 +196,56 @@
                 bp.LNG_GAODE,
                 bp.LAT_GAODE,
                 bp.ID AS LEDGER_ID,
-                dt.ONLINE_STATE
+                dt.ONLINE_STATE,
+                bt.ID AS DEVICE_TYPE_ID,
+                bp.DEPTID,
+                bp.POSITION,
+                bp.MONITOR_STATE,
+                bp.ON_STATE
         FROM
             device_temp dt
                 LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
-                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id
-                                                  <!--AND bl.type = 3-->
-                                                  AND bl.VALID = 1
+                 JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
                  JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
-                                               <!-- AND bl.type =3-->
-        <where>
+                 where   bp.LOCATION_CATEGORY=1
+
             <if test="deptids != null and deptids !='' ">
                 and bp.DEPTID in (${deptids})
             </if>
-        </where>
+
+    </select>
+
+    <select id="deviceHazardList" resultType="java.util.Map">
+
+        WITH device_temp AS ( SELECT bd.id, bd.DEVCODE, bd.DEVICE_TYPE,bd.ONLINE_STATE FROM bus_device bd WHERE
+        <!--bd.WATCH_OBJECT = 3 AND -->
+        VALID > 0 )
+        SELECT
+        dt.DEVCODE,
+        bt.TYPE_NAME,
+        bp.PIPE_CODE,
+        bp.TAG_NUMBER,
+        bp.LNG_GAODE,
+        bp.LAT_GAODE,
+        bp.ID AS LEDGER_ID,
+        dt.ONLINE_STATE,
+        bt.ID AS DEVICE_TYPE_ID,
+        bp.DEPTID,
+        bp.POSITION,
+        bp.MONITOR_STATE,
+        bp.ON_STATE,
+        bp.LOCATION_CATEGORY
+        FROM
+        device_temp dt
+        LEFT JOIN base_device_type bt ON bt.id = dt.DEVICE_TYPE
+        JOIN bus_device_ledger bl ON bl.DEVICE_ID = dt.id AND bl.VALID = 1
+        JOIN bus_ledger_pipe bp ON bp.id = bl.LEDGER_ID  and  bl.type=bp.type
+        where   bp.LOCATION_CATEGORY>1
+
+        <if test="deptids != null and deptids !='' ">
+            and bp.DEPTID in (${deptids})
+        </if>
+
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
index 93d1973..fb9924b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusStationMonitorMapper.xml
@@ -58,7 +58,7 @@
         <if test="deptIds != null and deptIds !=''">
             and bl.DEPTID in (${deptIds})
         </if>
-        ORDER BY bl.TS DESC
+        order by bl.MONITOR_STATE desc ,bl.TS DESC
     </select>
 
     <select id="list" resultType="com.casic.missiles.modular.device.entity.BusLedger">
@@ -68,7 +68,11 @@
         bl.LNG_GAODE,
         bl.LAT_GAODE,
         bl.MONITOR_STATE,
-        bl.TAG_NUMBER
+        bl.TAG_NUMBER,
+        bl.LEDGER_CODE,
+        bl.DEPTID,
+        bl.WELL_TYPE,
+        bl.ON_STATE
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '2'
@@ -104,8 +108,8 @@
     <select id="treeList" resultType="java.util.Map">
         WITH station_temp as(SELECT bl.ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID FROM `bus_ledger` bl  where bl.VALID=1 and bl.TYPE =2)
         select bl.ID as LEDGER_ID,bl.LEDGER_CODE,bl.TAG_NUMBER,bl.LEDGER_NAME,bl.DEPTID,bd.ID as DEVICE_ID,bd.DEVICE_NAME,bd.DEVCODE from station_temp bl
-        left join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1                                                                                                                        left join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
-
+         join bus_device_ledger bdl on bdl.LEDGER_ID = bl.ID and bdl.TYPE =2 and bdl.valid=1
+         join bus_device bd on bd.id= bdl.DEVICE_ID and bd.VALID=1
         order by bl.ID
     </select>
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
index b3aff86..b73ef63 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/BusWellMonitorMapper.xml
@@ -107,7 +107,7 @@
 
     <select id="list" resultType="com.casic.missiles.modular.device.dto.WellMapDTO">
         SELECT
-        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER
+        ID,LNG_GAODE, LAT_GAODE,MONITOR_STATE,LEDGER_CODE, LEDGER_NAME, TAG_NUMBER, bl.DEPTID, bl.PROPERTY_OWNER,bl.MANAGE_TYPE,bl.ON_STATE,bl.MARKER
         FROM
         bus_ledger bl
         WHERE VALID = '1' AND TYPE = '1'
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
index 1d97c64..e2f72d3 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dao/mapping/EqEquipRqMapper.xml
@@ -173,6 +173,7 @@
             EQ_USESTATE AS onState,
             MANAGE_TYPE AS manageType,
             ORG_CODE AS orgCode,
+            PRESSURE_LEVEL AS wellType,
             PROPERTY_UNIT_EMP AS propertyPerson,
             PROPERTY_UNIT_NAME AS propertyOwner,
             PROPERTY_UNIT_PHONE AS propertyPhone,
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
index 29f11e9..75d0a24 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeMonitorRequestDTO.java
@@ -42,4 +42,7 @@
     @ApiModelProperty("设备类型id")
     private Long devTypeId;
 
+    @ApiModelProperty("位置类别（1：管线监测点，2:交叉穿越点）")
+    private String locationCategory;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
index 5f8d90f..5b627c0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/BusLedgerPipeResponseDTO.java
@@ -81,5 +81,9 @@
     @ApiModelProperty("监控状态名称")
     private String monitorStateName;
 
+    @ApiModelProperty("监测点类型")
+    private String locationCategory;
 
+    @ApiModelProperty("安装日期")
+    private String installDate;
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
index 6570bc4..f18f760 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/dto/WellMapDTO.java
@@ -31,7 +31,22 @@
     @ApiModelProperty("纬度（高德）")
     private String latGaode;
 
+    @ApiModelProperty("管理单位id")
+    private Long deptid;
+
+    @ApiModelProperty("产权单位")
+    private String propertyOwner;
+
+    @ApiModelProperty("管理方式（0：自有，1：自管）")
+    private String manageType;
+
+    @ApiModelProperty("使用状态（0：停用，1：投用）")
+    private String onState;
+
     @ApiModelProperty("台账id")
     private Long id;
 
+    @ApiModelProperty("标签")
+    private String marker;
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
index 5a3d0b0..a1deb9b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BaseProduct.java
@@ -65,6 +65,22 @@
     @TableField("POWER_SUPPLY_MODE")
     private String powerSupplyMode;
 
+    @ApiModelProperty("productId电信平台记录")
+    @TableField("NB_PRODUCT_ID")
+    private String nbProductId;
+
+    @ApiModelProperty("密钥NB_APP_KEY")
+    @TableField("NB_APP_KEY")
+    private String nbAppKey;
+
+    @ApiModelProperty("密钥NB_APP_SECRET")
+    @TableField("NB_APP_SECRET")
+    private String nbAppSecret;
+
+    @ApiModelProperty("电信NB平台KEY,用于下发配置")
+    @TableField("MASTER_API_KEY")
+    private String masterApiKey;
+
 
     @ApiModelProperty("是否结束数据服务(1:是，0：否)")
     @TableField("DATA_SERVICE")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
index d0f45f6..3546de5 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/entity/BusDevice.java
@@ -84,22 +84,15 @@
     @ApiModelProperty("deviceId,电信平台记录")
     @TableField("NB_DEVICE_ID")
     private String nbDeviceId;
-
-    @ApiModelProperty("productId电信平台记录")
-    @TableField("NB_PRODUCT_ID")
-    private String nbProductId;
-
-    @ApiModelProperty("密钥NB_APP_KEY")
-    @TableField("NB_APP_KEY")
-    private String nbAppKey;
-
-    @ApiModelProperty("密钥NB_APP_SECRET")
-    @TableField("NB_APP_SECRET")
-    private String nbAppSecret;
-
-    @ApiModelProperty("电信NB平台KEY,用于下发配置")
-    @TableField("MASTER_API_KEY")
-    private String masterApiKey;
+//
+//    @ApiModelProperty("productId电信平台记录")
+//    @TableField("NB_PRODUCT_ID")
+//    private String nbProductId;
+//
+//
+//    @ApiModelProperty("密钥")
+//    @TableField("SECRET_KEY")
+//    private String secretKey;
 
     @ApiModelProperty("左侧指示带长度")
     @TableField("LEFT_LENGTH")
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
index 875a4c6..37f15ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/rs/RedisCommon.java
@@ -15,6 +15,8 @@
 @Service
 public class RedisCommon {
 
+
+    //系统默认 带密码
     @Autowired
     protected RedisTemplate<String, String> redisTemplate;
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
index e8ab390..f4c84f2 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBaseProductService.java
@@ -27,6 +27,8 @@
 
     boolean saveBaseProduct(BaseProduct baseProduct);
 
+    boolean updateBaseProductById(BaseProduct baseProduct);
+
     BaseProduct getBaseProductByCode(String productCode);
 
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
index 63c0576..86fd9f9 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusDeviceService.java
@@ -56,4 +56,6 @@
 
     List<BusDevice> getListByWellId(Long wellId);
 
+    List<BusDevice> getListByProductId(Long productId);
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
index 8692383..b511ccf 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/IBusLedgerPipeService.java
@@ -22,6 +22,8 @@
 
     Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
 
+    Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request);
+
     BusLedgerPipeResponseDTO detail(Long id, String devcode);
 
     List<Map<String, Object>> watchDataByPipe(MonitorDataRequestDTO requestDTO);
@@ -30,6 +32,8 @@
 
     List<Map<String, Object>> deviceList();
 
+    List<Map<String, Object>> deviceHazardList();
+
     BusLedgerPipe saveBusLedgerPipe(BusLedgerPipe busLedgerPipe);
 
     Boolean updateMonitorStatus(List<String> tagNumbers);
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
index 8f2edbe..d0e08fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BaseProductServiceImpl.java
@@ -1,6 +1,8 @@
 package com.casic.missiles.modular.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.service.AbstractDictService;
@@ -10,11 +12,17 @@
 import com.casic.missiles.modular.device.dto.SelectProductDTO;
 import com.casic.missiles.modular.device.entity.BaseProduct;
 import com.casic.missiles.modular.device.service.IBaseProductService;
+import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -24,11 +32,14 @@
  * @author zt
  * @since 2024-07-16
  */
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class BaseProductServiceImpl extends ServiceImpl<BaseProductMapper, BaseProduct> implements IBaseProductService {
 
     private final AbstractDictService dictService;
+    @Value("${casic.brSendConfigUrl}")
+    private String brSendConfigUrl;
 
     @Override
     public Page<BaseProduct> pageList(Page<BaseProduct> page, BaseProductDTO request) {
@@ -65,6 +76,29 @@
     }
 
     @Override
+    public boolean updateBaseProductById(BaseProduct baseProduct) {
+        this.baseMapper.updateById(baseProduct);
+        //发送设备电信平台aep属性
+        CompletableFuture.runAsync(() -> {
+            List<String> devcodesList = this.baseMapper.getDevCodesByProductId(baseProduct.getId());
+            List<Map<String, Object>> aepMapList = new ArrayList<>();
+            for (String devcode : devcodesList) {
+                Map<String, Object> aepMap = new HashMap<>();
+                aepMap.put("MASTER_API_KEY", baseProduct.getMasterApiKey());
+                aepMap.put("NB_DEVICE_ID", "");
+                aepMap.put("NB_PRODUCT_ID", baseProduct.getNbProductId());
+                aepMap.put("NB_APP_KEY", baseProduct.getNbAppKey());
+                aepMap.put("NB_APP_SECRET", baseProduct.getNbAppSecret());
+                aepMap.put("DEVCODE", devcode);
+                aepMapList.add(aepMap);
+            }
+            String result = HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
+            log.info("推送aep属性返回结果：" + result);
+        });
+        return true;
+    }
+
+    @Override
     public BaseProduct getBaseProductByCode(String productCode) {
         return this.baseMapper.getBaseProductByCode(productCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
index a6a658a..e07a043 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusConfigServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,11 +13,9 @@
 import com.casic.missiles.modular.device.dto.BusConfigOtherDTO;
 import com.casic.missiles.modular.device.dto.BusConfigRequestDTO;
 import com.casic.missiles.modular.device.entity.BusConfig;
-import com.casic.missiles.modular.device.entity.BusDevice;
 import com.casic.missiles.modular.device.rs.CommConfigDTO;
 import com.casic.missiles.modular.device.rs.RedisCommon;
 import com.casic.missiles.modular.device.service.IBusConfigService;
-import com.casic.missiles.modular.device.service.IBusDeviceService;
 import com.casic.missiles.util.HttpClientUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
@@ -29,9 +26,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -46,10 +41,7 @@
 public class BusConfigServiceImpl extends ServiceImpl<BusConfigMapper, BusConfig> implements IBusConfigService {
 
     private final AbstractPermissionContext abstractPermissionContext;
-    private final IBusDeviceService iBusDeviceService;
     private final RedisCommon redisCommon;
-    private final ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(3, 6, 60, TimeUnit.SECONDS, new LinkedBlockingDeque<>(10));
-
     @Value("${casic.brSendConfigUrl}")
     private String brSendConfigUrl;
 
@@ -80,7 +72,7 @@
                                 .concat("次;").concat("上传周期:")
                                 .concat(busConfigTO.getUploadPeriod())
                                 .concat("分"));
-                        redisCommon.setRedisConfig(devcode,CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
+                        redisCommon.setRedisConfig(devcode, CommConfigDTO.builder().repeat(Long.valueOf(busConfigTO.getReloadInterval()))
                                 .interval(Long.valueOf(busConfigTO.getCollectInterval()))
                                 .period(Long.valueOf(busConfigTO.getUploadPeriod())).build());
                         break;
@@ -96,7 +88,7 @@
                 busConfigTO.setDevcode(devcode);
                 this.baseMapper.insert(busConfigTO);
             });
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
@@ -134,75 +126,31 @@
                     .operatorName(user != null ? user.getName() : "").build());
         });
 
+        CompletableFuture.runAsync(() -> {
+                    //发送第三方下发：
+                    if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
 
-        threadPoolExecutor.execute(
-                () -> {
-                    List<BusDevice> busDeviceList = iBusDeviceService.getDevicesByCodes(devcodes);
-                    try {
-                        //发送前先下发设备电信平台aep属性
-                        List<Map<String, Object>> aepMapList = new ArrayList<>();
-                        for (BusDevice busDevice : busDeviceList) {
-                            Map<String, Object> aepMap = new HashMap<>();
-                            aepMap.put("MASTER_API_KEY", busDevice.getMasterApiKey());
-                            aepMap.put("NB_DEVICE_ID", busDevice.getNbDeviceId());
-                            aepMap.put("NB_PRODUCT_ID", busDevice.getNbProductId());
-                            aepMap.put("NB_APP_KEY", busDevice.getNbAppKey());
-                            aepMap.put("NB_APP_SECRET", busDevice.getNbAppSecret());
-                            aepMap.put("DEVCODE", busDevice.getDevcode());
-                            aepMapList.add(aepMap);
                         }
-                        HttpClientUtils.post(brSendConfigUrl + "/api/device/aepExt", JSON.toJSONString(aepMapList, SerializerFeature.WriteMapNullValue));
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    } finally {
-                        //发送第三方下发：
-                        if (busConfigOtherDTO.getProductName().contains("管网哨兵")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/tube/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
-                        } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
-                            for (BusDevice busDevice : busDeviceList) {
-                                if (ObjectUtil.isAllNotEmpty(busDevice.getNbProductId(), busDevice.getNbDeviceId())) {
-                                    Map<String, Object> commandMap = new HashMap<>();
-                                    commandMap.put("productId", busDevice.getNbProductId());
-                                    commandMap.put("devCode", busDevice.getDevcode());
-                                    commandMap.put("deviceId", busDevice.getNbDeviceId());
-                                    commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
-                                    HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
-                                }
-                            }
+                    } else if (busConfigOtherDTO.getProductName().contains("智能警示桩")) {
+                        for (String devcode : devcodes) {
+                            Map<String, Object> commandMap = new HashMap<>();
+                            commandMap.put("productId", "");
+                            commandMap.put("devCode", devcode);
+                            commandMap.put("deviceId", "");
+                            commandMap.put("cmdList", busConfigOtherDTO.getCommandConfigList());
+                            HttpClientUtils.post(brSendConfigUrl + "/sentinel/config/send", JSON.toJSONString(commandMap));
                         }
                     }
                 }
         );
-
-
         return this.saveBatch(busConfigs);
-//        List<Map<String,Object>> mapList = new ArrayList<>();
-//        Map<String,Object> commandMap = new HashMap<>();
-//        commandMap.put("command","11");
-//        commandMap.put("value","1800");
-//        mapList.add(commandMap);
-//        Map<String,Object> commandMap2 = new HashMap<>();
-//        commandMap2.put("command","12");
-//        commandMap2.put("value","6");
-//        mapList.add(commandMap2);
-//
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("deviceId","58bca85e6ccb4b0ebb34289e7207e1b3");
-//        map.put("devCode","341524019833");
-//        map.put("productId","15074311");
-//        map.put("cmdList",mapList);
-//
-//        HttpClientUtils.post("brAppUrl", JSON.toJSONString(map));
-//        return  true;
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
index 40eded1..d5fc2e8 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusDeviceServiceImpl.java
@@ -543,4 +543,12 @@
     public List<BusDevice> getListByWellId(Long wellId) {
         return this.baseMapper.getListByWellId(wellId);
     }
+
+    @Override
+    public List<BusDevice> getListByProductId(Long productId) {
+        QueryWrapper<BusDevice> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PRODUCT_ID", productId);
+        queryWrapper.eq("VALID", "1");
+        return this.baseMapper.selectList(queryWrapper);
+    }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
index d29e59a..d13937d 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusLedgerPipeServiceImpl.java
@@ -73,7 +73,7 @@
 
     @Override
     public Page<BusLedgerPipe> monitorPipePageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
-
+        page.setOptimizeCountSql(false);
         Page<BusLedgerPipe> pageList = this.baseMapper.monitorPipePageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
         List<BusLedgerPipe> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
@@ -86,6 +86,20 @@
     }
 
     @Override
+    public Page<BusLedgerPipe> monitorHazardPageList(Page<BusLedgerPipe> page, BusLedgerPipeMonitorRequestDTO request) {
+        page.setOptimizeCountSql(false);
+        Page<BusLedgerPipe> pageList = this.baseMapper.monitorHazardPageList(page, request, commonServer.getDeptScopeIds(request.getDeptId()));
+        List<BusLedgerPipe> busLedgerList = pageList.getRecords();
+        busLedgerList.forEach(busLedger -> {
+            busLedger.setOnState("1".equals(busLedger.getOnState()) ? "在用" : "备用"); // 在用状态字典值
+            busLedger.setDeptName(ObjectUtil.isNotEmpty(busLedger.getDeptid()) ? commonServer.getDeptNamesByDeptId(busLedger.getDeptid()) : ""); // 管理单位名称
+            busLedger.setPressType(abstractDictService.getDictNameByCode("wellType", busLedger.getPressType())); // 位置状态字典值
+            busLedger.setMonitorState(abstractDictService.getDictNameByCode("monitorState", busLedger.getMonitorState())); // 监控状态字典值
+        });
+        return pageList;
+    }
+
+    @Override
     public BusLedgerPipeResponseDTO detail(Long id, String devcode) {
         BusLedgerPipeResponseDTO busLedgerPipeResponseDTO = this.baseMapper.detail(id, devcode);
         if (null != busLedgerPipeResponseDTO) {
@@ -133,6 +147,11 @@
         return this.baseMapper.deviceList(commonServer.getDeptScopeIds(null));
     }
 
+    @Override
+    public List<Map<String, Object>> deviceHazardList() {
+        return this.baseMapper.deviceHazardList(commonServer.getDeptScopeIds(null));
+    }
+
     public List<Long> getDeptids() {
         AuthUser authUser = permissionContext.getAuthService().getLoginUser();
         String scopeType = authUser.getScopeType();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
index 158e56c..a875e38 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusStationMonitorServiceImpl.java
@@ -35,6 +35,7 @@
 
     @Override
     public Page<BusLedger> pageList(Page<BusLedger> page, BusLedgerDTO request) {
+        page.setOptimizeCountSql(false);
         Page<BusLedger> pageList = this.baseMapper.pageList(commonServer.getDeptScopeIds(request.getDeptid()), page, request);
         List<BusLedger> busLedgerList = pageList.getRecords();
         busLedgerList.forEach(busLedger -> {
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
index 2b4a2e0..b09d6c1 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/device/service/impl/BusWellMonitorServiceImpl.java
@@ -58,7 +58,7 @@
 
 
     //todo:同步清除缓存
-    @Cacheable(value = "wellCache", key = "#request.getSfq()")
+//    @Cacheable(value = "wellCache", key = "#request.getSfq()")
     @Override
     public List<WellMapDTO> list(BusLedgerDTO request) {
         return this.baseMapper.list(commonServer.getDeptScopeIds(request.getDeptid()), request);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index e9fcd51..4c7d9f8 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -15,8 +15,8 @@
 # session:b
 #   store-type: redis
   redis:
-    host: 111.198.10.15
-    port: 11412
+    host: 172.17.112.21
+    port: 6379
     password: ew5T4K3#203lwh
     serializer: org.springframework.data.redis.serializer.StringRedisSerializer
     redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
@@ -32,7 +32,7 @@
   brPanControlUrl: http://172.17.240.116:9092/HK/controCearm
   brPanVideoUrl: http://172.17.240.116:9092/HK/getPlayBackUrl
   brPanRealVideoUrl: http://172.17.240.116:9092/HK/getUrl
-  brSendConfigUrl: http://111.198.10.15:11642
+  brSendConfigUrl: http://172.17.112.21:4011
   enabled: true
 smartcity:
   config: