diff --git a/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java b/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java
index b6dc0ff..ef6d939 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo;
 import com.gunshi.project.xyt.model.IaCBsnssinfo;
 import com.gunshi.project.xyt.service.IaCBsnssinfoService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,9 @@ public class IaCBsnssinfoController {
         return R.ok(service.page(null,null));
     }
 
+    @Operation(summary = "详情和行政区划数据查询")
+    @PostMapping("/getDetailsAndAddvcdDataList")
+    public R<List<HomeIaCBsnssinfoVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataLis());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java b/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
index 3625963..bbae280 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/IaCDanadController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeIaCDanadVo;
 import com.gunshi.project.xyt.model.IaCDanad;
 import com.gunshi.project.xyt.service.IaCDanadService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,10 @@ public class IaCDanadController {
         return R.ok(service.page(null,null));
     }
 
+
+    @Operation(summary = "详情和行政区划数据查询")
+    @PostMapping("/getDetailsAndAddvcdDataList")
+    public R<List<HomeIaCDanadVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataLis());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/IaCFlrvvlgController.java b/src/main/java/com/gunshi/project/xyt/controller/IaCFlrvvlgController.java
index d0f24a1..98dbdd7 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/IaCFlrvvlgController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/IaCFlrvvlgController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeIaCFlrvvlgVo;
 import com.gunshi.project.xyt.model.IaCFlrvvlg;
 import com.gunshi.project.xyt.service.IaCFlrvvlgService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,11 @@ public class IaCFlrvvlgController {
         return R.ok(service.page(null,null));
     }
 
+
+    @Operation(summary = "详情和行政区划数据查询")
+    @PostMapping("/getDetailsAndAddvcdDataList")
+    public R<List<HomeIaCFlrvvlgVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataLis());
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java
index d3cfa3f..9fc6354 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticFlowDeviceController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticFlowDeviceVo;
 import com.gunshi.project.xyt.model.OsmoticFlowDevice;
 import com.gunshi.project.xyt.service.OsmoticFlowDeviceService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,9 @@ public class OsmoticFlowDeviceController {
         return R.ok(service.page(null,null));
     }
 
+    @Operation(summary = "详情和监测数据查询")
+    @PostMapping("/getDetailsAndMonitoringDataList")
+    public R<List<HomeOsmoticFlowDeviceVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataList());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java
index 729e4e5..bd5c004 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticPressDeviceController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticPressDeviceVo;
 import com.gunshi.project.xyt.model.OsmoticPressDevice;
 import com.gunshi.project.xyt.service.OsmoticPressDeviceService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,11 @@ public class OsmoticPressDeviceController {
         return R.ok(service.page(null,null));
     }
 
+
+    @Operation(summary = "详情和监测数据查询")
+    @PostMapping("/getDetailsAndMonitoringDataList")
+    public R<List<HomeOsmoticPressDeviceVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataList());
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftDeviceController.java b/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftDeviceController.java
new file mode 100644
index 0000000..c00e7b7
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/controller/OsmoticShiftDeviceController.java
@@ -0,0 +1,71 @@
+package com.gunshi.project.xyt.controller;
+
+import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticShiftDeviceVo;
+import com.gunshi.project.xyt.model.OsmoticShiftDevice;
+import com.gunshi.project.xyt.service.OsmoticShiftDeviceService;
+import com.gunshi.project.xyt.validate.markers.Insert;
+import com.gunshi.project.xyt.validate.markers.Update;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 描述: 位移监测记录表
+ * author: xusan
+ * date: 2024-07-08 17:40:37
+ */
+@Tag(name = "位移设备表")
+@RestController
+@RequestMapping(value="/osmoticShiftDevice")
+public class OsmoticShiftDeviceController {
+
+    @Autowired
+    private OsmoticShiftDeviceService service;
+
+
+    @Operation(summary = "新增")
+    @PostMapping("/insert")
+    public R<OsmoticShiftDevice> insert(@Validated(Insert.class) @RequestBody OsmoticShiftDevice dto) {
+        boolean result = service.save(dto);
+        return R.ok(result ? dto : null);
+    }
+
+    @Operation(summary = "修改")
+    @PostMapping("/update")
+    public R<OsmoticShiftDevice> update(@Validated(Update.class) @RequestBody OsmoticShiftDevice dto) {
+        boolean result = service.updateById(dto);
+        return R.ok(result ? dto : null);
+    }
+
+    @Operation(summary = "删除")
+    @GetMapping("/del/{id}")
+    public R<Boolean> del(@Schema(name = "id") @PathVariable("id") Serializable id) {
+        return R.ok(service.removeById(id));
+    }
+
+    @Operation(summary = "列表")
+    @PostMapping("/list")
+    public R<List<OsmoticShiftDevice>> list() {
+        return R.ok(service.lambdaQuery().list());
+    }
+
+    @Operation(summary = "分页")
+    @PostMapping("/page")
+    public R<List<OsmoticShiftDevice>> page() {
+        return R.ok(service.page(null,null));
+    }
+
+
+    @Operation(summary = "详情和监测数据查询(暂无设备表,无法使用)")
+    @PostMapping("/getDetailsAndMonitoringDataList")
+    public R<List<HomeOsmoticShiftDeviceVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataList());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/ShpPlacementController.java b/src/main/java/com/gunshi/project/xyt/controller/ShpPlacementController.java
index fef1b0e..9d58233 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ShpPlacementController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ShpPlacementController.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.controller;
 
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.vo.HomeShpPlacementVo;
 import com.gunshi.project.xyt.model.ShpPlacement;
 import com.gunshi.project.xyt.service.ShpPlacementService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -60,4 +61,11 @@ public class ShpPlacementController {
         return R.ok(service.page(null,null));
     }
 
+
+
+    @Operation(summary = "详情和行政区划数据查询")
+    @PostMapping("/getDetailsAndAddvcdDataList")
+    public R<List<HomeShpPlacementVo>> getDetailsAndMonitoringDataList() {
+        return R.ok(service.getDetailsAndMonitoringDataLis());
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java b/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java
index b133e33..0800680 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/StStbprpBController.java
@@ -1,6 +1,10 @@
 package com.gunshi.project.xyt.controller;
 
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.gunshi.core.result.R;
+import com.gunshi.project.xyt.entity.so.HomeStStbprpBSo;
+import com.gunshi.project.xyt.entity.so.StStbprpBSo;
+import com.gunshi.project.xyt.entity.vo.HomeStStbprpBVo;
 import com.gunshi.project.xyt.model.StStbprpB;
 import com.gunshi.project.xyt.service.StStbprpBService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -15,11 +19,11 @@ import org.springframework.web.bind.annotation.*;
 import java.io.Serializable;
 import java.util.List;
 /**
- * 描述: sttp 以水利标准来
+ * 描述: 测站基础信息表
  * author: xusan
  * date: 2024-07-08 17:40:37
  */
-@Tag(name = "sttp 以水利标准来")
+@Tag(name = "测站基础信息表")
 @RestController
 @RequestMapping(value="/stStbprpB")
 public class StStbprpBController {
@@ -50,8 +54,17 @@ public class StStbprpBController {
 
     @Operation(summary = "列表")
     @PostMapping("/list")
-    public R<List<StStbprpB>> list() {
-        return R.ok(service.lambdaQuery().list());
+    public R<List<StStbprpB>> list(@RequestBody StStbprpBSo dto) {
+        LambdaQueryChainWrapper<StStbprpB> query = service.lambdaQuery();
+        query
+                .eq(StStbprpB::getSttp,dto.getSttp())
+                .eq(StStbprpB::getStcd,dto.getStcd())
+                .like(StStbprpB::getStnm,dto.getStnm())
+                .like(StStbprpB::getRvnm,dto.getRvnm())
+                .like(StStbprpB::getHnnm,dto.getHnnm())
+                .like(StStbprpB::getBsnm,dto.getBsnm())
+        ;
+        return R.ok(query.list());
     }
 
     @Operation(summary = "分页")
@@ -60,4 +73,23 @@ public class StStbprpBController {
         return R.ok(service.page(null,null));
     }
 
+    @Operation(summary = "雨量站详情带雨量列表")
+    @PostMapping("/rainfallStationDetails/rainfallList")
+    public R<List<HomeStStbprpBVo>> rainfallStationDetailsList(@RequestBody @Validated HomeStStbprpBSo dto) {
+        return R.ok(service.rainfallStationDetailsList(dto));
+    }
+
+    @Operation(summary = "水库站点详情带实时水位列表")
+    @PostMapping("/reservoirStationDetails/realTimeWaterLevelList")
+    public R<List<HomeStStbprpBVo>> reservoirStationDetailsList() {
+        return R.ok(service.reservoirStationDetailsList());
+    }
+
+    @Operation(summary = "流量站点详情带实时流量列表")
+    @PostMapping("/trafficSiteDetails/realTimeTrafficList")
+    public R<List<HomeStStbprpBVo>> trafficStationDetailsList() {
+        return R.ok(service.flowStationDetailsList());
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/HomeStStbprpBSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/HomeStStbprpBSo.java
new file mode 100644
index 0000000..8499019
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/HomeStStbprpBSo.java
@@ -0,0 +1,41 @@
+package com.gunshi.project.xyt.entity.so;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gunshi.core.dateformat.DateFormatString;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * TODO
+ *
+ * @ClassName StPptnSo
+ * @Author Huang Qianxiang
+ * @Date 2024/2/21 14:20
+ */
+@Data
+@Schema(description = "首页站点查询参数")
+public class HomeStStbprpBSo {
+
+
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    @NotNull(message = "开始时间不能为空")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date stm;
+
+    /**
+     * 结束时间
+     */
+    @Schema(description="结束时间")
+    @NotNull(message = "结束时间不能为空")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date etm;
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/StStbprpBSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/StStbprpBSo.java
new file mode 100644
index 0000000..86bb11e
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/StStbprpBSo.java
@@ -0,0 +1,56 @@
+package com.gunshi.project.xyt.entity.so;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/**
+ * TODO
+ *
+ * @ClassName StPptnSo
+ * @Author Huang Qianxiang
+ * @Date 2024/2/21 14:20
+ */
+@Data
+@Schema(description = "站点查询参数")
+public class StStbprpBSo {
+
+
+    /**
+     * 测站名称
+     */
+    @Schema(description = "测站名称")
+    private String stnm;
+
+    /**
+     * 测站编码
+     */
+    @Schema(description="测站编码")
+    private String stcd;
+
+    /**
+     * 河流名称
+     */
+    @Schema(description="河流名称")
+    private String rvnm;
+
+    /**
+     * 水系名称
+     */
+    @Schema(description="水系名称")
+    private String hnnm;
+
+    /**
+     * 流域名称
+     */
+    @Schema(description="流域名称")
+    private String bsnm;
+
+
+    /**
+     * 站类，PP=雨量站，RR=水库水位站，ZQ=河道水位站，TX=图像站
+     */
+    @Schema(description="站类，PP=雨量站，RR=水库水位站，ZQ=河道水位站，TX=图像站")
+    private String sttp;
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCBsnssinfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCBsnssinfoVo.java
new file mode 100644
index 0000000..ba73f80
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCBsnssinfoVo.java
@@ -0,0 +1,25 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.gunshi.project.xyt.model.IaCBsnssinfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeIaCBsnssinfoVo extends IaCBsnssinfo {
+
+    /**
+     * 行政区划名
+     */
+    @Schema(description="行政区划名")
+    private String adnm;
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCDanadVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCDanadVo.java
new file mode 100644
index 0000000..576ed7b
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCDanadVo.java
@@ -0,0 +1,26 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.gunshi.project.xyt.model.IaCDanad;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class HomeIaCDanadVo extends IaCDanad {
+
+    /**
+     * 行政区划名
+     */
+    @Schema(description="行政区划名")
+    private String adnm;
+
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCFlrvvlgVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCFlrvvlgVo.java
new file mode 100644
index 0000000..8f472b8
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeIaCFlrvvlgVo.java
@@ -0,0 +1,26 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.gunshi.project.xyt.model.IaCFlrvvlg;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class HomeIaCFlrvvlgVo extends IaCFlrvvlg {
+
+    /**
+     * 行政区划名
+     */
+    @Schema(description="行政区划名")
+    private String adnm;
+
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticFlowDeviceVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticFlowDeviceVo.java
new file mode 100644
index 0000000..c3d5b2f
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticFlowDeviceVo.java
@@ -0,0 +1,36 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.project.xyt.model.OsmoticFlowDevice;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeOsmoticFlowDeviceVo extends OsmoticFlowDevice {
+
+
+    /**
+     * 管水位
+     */
+    @Schema(description="流量")
+    private String q;
+
+    /**
+     * 监测时间
+     */
+    @Schema(description="监测时间")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date tm;
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticPressDeviceVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticPressDeviceVo.java
new file mode 100644
index 0000000..263331f
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticPressDeviceVo.java
@@ -0,0 +1,35 @@
+package com.gunshi.project.xyt.entity.vo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.project.xyt.model.OsmoticPressDevice;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+* 描述: 渗压设备表
+* author: xusan
+* date: 2024-07-08 17:34:26
+*/
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeOsmoticPressDeviceVo extends OsmoticPressDevice {
+
+        /**
+         * 管水位
+         */
+        @Schema(description="管水位")
+        private String value;
+
+        /**
+         * 监测时间
+         */
+        @Schema(description="监测时间")
+        @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+        private Date tm;
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticShiftDeviceVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticShiftDeviceVo.java
new file mode 100644
index 0000000..c2e1a54
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeOsmoticShiftDeviceVo.java
@@ -0,0 +1,49 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.gunshi.core.dateformat.DateFormatString;
+import com.gunshi.project.xyt.model.OsmoticShiftDevice;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeOsmoticShiftDeviceVo extends OsmoticShiftDevice {
+
+    /**
+     * x方向
+     */
+    @Schema(description="x方向")
+    private String x;
+
+    /**
+     * y方向
+     */
+    @Schema(description="y方向")
+    private String y;
+
+    /**
+     * h方向
+     */
+    @Schema(description="h方向")
+    private String h;
+
+    /**
+     * 监测时间
+     */
+    @Schema(description="监测时间")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    private Date tm;
+
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeShpPlacementVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeShpPlacementVo.java
new file mode 100644
index 0000000..f42da30
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeShpPlacementVo.java
@@ -0,0 +1,26 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.gunshi.project.xyt.model.ShpPlacement;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeShpPlacementVo extends ShpPlacement {
+
+    /**
+     * 行政区划名
+     */
+    @Schema(description="行政区划名")
+    private String adnm;
+
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/HomeStStbprpBVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeStStbprpBVo.java
new file mode 100644
index 0000000..ccb1de0
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/HomeStStbprpBVo.java
@@ -0,0 +1,27 @@
+package com.gunshi.project.xyt.entity.vo;
+
+import com.gunshi.project.xyt.model.StStbprpB;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * Description:
+ * Created by XuSan on 2024/7/10.
+ *
+ * @author XuSan
+ * @version 1.0
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HomeStStbprpBVo extends StStbprpB {
+
+
+    /**
+     * 数据
+     */
+    @Schema(description="数据")
+    private BigDecimal v;
+}
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
index 6f8b527..b19892f 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCBsnssinfoMapper.java
@@ -1,8 +1,12 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo;
 import com.gunshi.project.xyt.model.IaCBsnssinfo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 防治区企事业单位汇总表
@@ -12,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IaCBsnssinfoMapper extends BaseMapper<IaCBsnssinfo> {
 
+    @Select("""
+            <script>
+            SELECT st.*,r.adnm FROM ia_c_bsnssinfo st
+            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            </script>
+            """)
+    List<HomeIaCBsnssinfoVo> getDetailsAndMonitoringDataLis();
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
index daf52f7..b4e6bab 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCDanadMapper.java
@@ -1,8 +1,13 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo;
+import com.gunshi.project.xyt.entity.vo.HomeIaCDanadVo;
 import com.gunshi.project.xyt.model.IaCDanad;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 危险区基本情况调查成果汇总表
@@ -12,4 +17,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IaCDanadMapper extends BaseMapper<IaCDanad> {
 
+
+    @Select("""
+            <script>
+            SELECT st.*,r.adnm FROM ia_c_danad st
+            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            </script>
+            """)
+    List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
index 4a313aa..680b3dd 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/IaCFlrvvlgMapper.java
@@ -1,8 +1,12 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeIaCFlrvvlgVo;
 import com.gunshi.project.xyt.model.IaCFlrvvlg;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 重要沿河村落居民户调查成果表
@@ -12,4 +16,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IaCFlrvvlgMapper extends BaseMapper<IaCFlrvvlg> {
 
+
+    @Select("""
+            <script>
+            SELECT st.*,r.adnm FROM ia_c_flrvvlg st
+            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            </script>
+            """)
+    List<HomeIaCFlrvvlgVo> getDetailsAndMonitoringDataLis();
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticFlowDeviceMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticFlowDeviceMapper.java
index a7ef3ba..777e521 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticFlowDeviceMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticFlowDeviceMapper.java
@@ -1,8 +1,12 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticFlowDeviceVo;
 import com.gunshi.project.xyt.model.OsmoticFlowDevice;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 渗流设备表
@@ -12,4 +16,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OsmoticFlowDeviceMapper extends BaseMapper<OsmoticFlowDevice> {
 
+    @Select("""
+            <script>
+            SELECT st.*,r.q,r.tm FROM osmotic_flow_device st
+            LEFT JOIN (SELECT station_code,MAX(tm) tm FROM osmotic_flow_r GROUP BY station_code) maxr ON st.station_code = maxr.station_code
+            LEFT JOIN osmotic_flow_r r ON maxr.station_code = r.station_code AND maxr.tm = r.tm
+            </script>
+            """)
+    List<HomeOsmoticFlowDeviceVo> getDetailsAndMonitoringDataList();
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressDeviceMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressDeviceMapper.java
index ed2710b..5294fe1 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressDeviceMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticPressDeviceMapper.java
@@ -1,8 +1,12 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticPressDeviceVo;
 import com.gunshi.project.xyt.model.OsmoticPressDevice;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 渗压设备表
@@ -12,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OsmoticPressDeviceMapper extends BaseMapper<OsmoticPressDevice> {
 
+    @Select("""
+            <script>
+            SELECT st.*,r.value,r.tm FROM osmotic_press_device st
+            LEFT JOIN (SELECT station_code,MAX(tm) tm FROM osmotic_press_r GROUP BY station_code) maxr ON st.station_code = maxr.station_code
+            LEFT JOIN osmotic_press_r r ON maxr.station_code = r.station_code AND maxr.tm = r.tm
+            </script>
+            """)
+    List<HomeOsmoticPressDeviceVo> getDetailsAndMonitoringDataList();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftDeviceMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftDeviceMapper.java
new file mode 100644
index 0000000..f8d5310
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/mapper/OsmoticShiftDeviceMapper.java
@@ -0,0 +1,27 @@
+package com.gunshi.project.xyt.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticShiftDeviceVo;
+import com.gunshi.project.xyt.model.OsmoticShiftDevice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * 描述: 位移监测记录表
+ * author: xusan
+ * date: 2024-07-08 15:44:07
+ */
+@Mapper
+public interface OsmoticShiftDeviceMapper extends BaseMapper<OsmoticShiftDevice> {
+
+    @Select("""
+            <script>
+            SELECT st.*,r.x,r.y,r.h,r.tm FROM osmotic_shift_device st
+            LEFT JOIN (SELECT station_code,MAX(tm) tm FROM osmotic_shift_r GROUP BY station_code) maxr ON st.station_code = maxr.station_code
+            LEFT JOIN osmotic_shift_r r ON maxr.station_code = r.station_code AND maxr.tm = r.tm
+            </script>
+            """)
+    List<HomeOsmoticShiftDeviceVo> getDetailsAndMonitoringDataList();
+}
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
index 9679c3b..64b337b 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/ShpPlacementMapper.java
@@ -1,8 +1,12 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.vo.HomeShpPlacementVo;
 import com.gunshi.project.xyt.model.ShpPlacement;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: 安置点
@@ -12,4 +16,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ShpPlacementMapper extends BaseMapper<ShpPlacement> {
 
+    @Select("""
+            <script>
+            SELECT st.*,r.adnm FROM shp_placement st
+            LEFT JOIN st_addvcd_d r ON st.adcd = r.adcd
+            </script>
+            """)
+    List<HomeShpPlacementVo> getDetailsAndMonitoringDataList();
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
index cec6a68..833d177 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java
@@ -1,8 +1,14 @@
 package com.gunshi.project.xyt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gunshi.project.xyt.entity.so.HomeStStbprpBSo;
+import com.gunshi.project.xyt.entity.vo.HomeStStbprpBVo;
 import com.gunshi.project.xyt.model.StStbprpB;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 描述: sttp 以水利标准来
@@ -12,4 +18,33 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
 
+    @Select("""
+            <script>
+            SELECT st.*,SUM(r.drp) v FROM st_stbprp_b st
+            LEFT JOIN st_pptn_r r ON st.stcd = r.stcd
+            WHERE st.sttp = 'PP'
+            AND r.tm BETWEEN #{dto.stm} AND #{dto.etm}
+            GROUP BY st.stcd
+            </script>
+            """)
+    List<HomeStStbprpBVo> rainfallStationDetailsList(@Param("dto") HomeStStbprpBSo dto);
+
+    @Select("""
+            <script>
+            SELECT st.*,r.rz v FROM st_stbprp_b st
+            LEFT JOIN st_rsvr_r_real r ON st.stcd = r.stcd
+            WHERE st.sttp = 'RR'
+            </script>
+            """)
+    List<HomeStStbprpBVo> reservoirStationDetailsList();
+
+    @Select("""
+            <script>
+            SELECT st.*,r.q v FROM st_stbprp_b st
+            LEFT JOIN st_water_r_real r ON st.stcd = r.stcd
+            WHERE st.sttp = 'ZQ'
+            </script>
+            """)
+    List<HomeStStbprpBVo> flowStationDetailsList();
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftDevice.java b/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftDevice.java
new file mode 100644
index 0000000..02b138f
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/model/OsmoticShiftDevice.java
@@ -0,0 +1,22 @@
+package com.gunshi.project.xyt.model;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述: 位移设备表
+ * author: xusan
+ * date: 2024-07-08 17:34:26
+ */
+@Schema(description="位移设备表")
+@Data
+@TableName("public.osmotic_shift_device")
+public class OsmoticShiftDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/service/IaCBsnssinfoService.java b/src/main/java/com/gunshi/project/xyt/service/IaCBsnssinfoService.java
index 4d4917d..52d984b 100644
--- a/src/main/java/com/gunshi/project/xyt/service/IaCBsnssinfoService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/IaCBsnssinfoService.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo;
 import com.gunshi.project.xyt.mapper.IaCBsnssinfoMapper;
 import com.gunshi.project.xyt.model.IaCBsnssinfo;
 import lombok.extern.slf4j.Slf4j;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 防治区企事业单位汇总表
@@ -20,6 +22,9 @@ import java.util.Date;
 public class IaCBsnssinfoService extends ServiceImpl<IaCBsnssinfoMapper, IaCBsnssinfo>
 {
 
+    public List<HomeIaCBsnssinfoVo> getDetailsAndMonitoringDataLis() {
+        return baseMapper.getDetailsAndMonitoringDataLis();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java b/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
index 100d153..526ba4f 100644
--- a/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/IaCDanadService.java
@@ -1,13 +1,14 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeIaCDanadVo;
 import com.gunshi.project.xyt.mapper.IaCDanadMapper;
 import com.gunshi.project.xyt.model.IaCDanad;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 危险区基本情况调查成果汇总表
@@ -20,6 +21,9 @@ import java.util.Date;
 public class IaCDanadService extends ServiceImpl<IaCDanadMapper, IaCDanad>
 {
 
+    public List<HomeIaCDanadVo> getDetailsAndMonitoringDataLis() {
+        return baseMapper.getDetailsAndMonitoringDataLis();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/IaCFlrvvlgService.java b/src/main/java/com/gunshi/project/xyt/service/IaCFlrvvlgService.java
index 254a5e9..514542b 100644
--- a/src/main/java/com/gunshi/project/xyt/service/IaCFlrvvlgService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/IaCFlrvvlgService.java
@@ -1,13 +1,14 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeIaCFlrvvlgVo;
 import com.gunshi.project.xyt.mapper.IaCFlrvvlgMapper;
 import com.gunshi.project.xyt.model.IaCFlrvvlg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 重要沿河村落居民户调查成果表
@@ -20,6 +21,9 @@ import java.util.Date;
 public class IaCFlrvvlgService extends ServiceImpl<IaCFlrvvlgMapper, IaCFlrvvlg>
 {
 
+    public List<HomeIaCFlrvvlgVo> getDetailsAndMonitoringDataLis() {
+        return baseMapper.getDetailsAndMonitoringDataLis();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowDeviceService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowDeviceService.java
index 15ec32e..c7967a7 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowDeviceService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticFlowDeviceService.java
@@ -1,13 +1,14 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticFlowDeviceVo;
 import com.gunshi.project.xyt.mapper.OsmoticFlowDeviceMapper;
 import com.gunshi.project.xyt.model.OsmoticFlowDevice;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 渗流设备表
@@ -20,6 +21,9 @@ import java.util.Date;
 public class OsmoticFlowDeviceService extends ServiceImpl<OsmoticFlowDeviceMapper, OsmoticFlowDevice>
 {
 
+    public List<HomeOsmoticFlowDeviceVo> getDetailsAndMonitoringDataList() {
+        return baseMapper.getDetailsAndMonitoringDataList();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressDeviceService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressDeviceService.java
index 90e2998..173d159 100644
--- a/src/main/java/com/gunshi/project/xyt/service/OsmoticPressDeviceService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticPressDeviceService.java
@@ -1,13 +1,14 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticPressDeviceVo;
 import com.gunshi.project.xyt.mapper.OsmoticPressDeviceMapper;
 import com.gunshi.project.xyt.model.OsmoticPressDevice;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 渗压设备表
@@ -20,6 +21,9 @@ import java.util.Date;
 public class OsmoticPressDeviceService extends ServiceImpl<OsmoticPressDeviceMapper, OsmoticPressDevice>
 {
 
+    public List<HomeOsmoticPressDeviceVo> getDetailsAndMonitoringDataList() {
+        return baseMapper.getDetailsAndMonitoringDataList();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftDeviceService.java b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftDeviceService.java
new file mode 100644
index 0000000..fc4b933
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/service/OsmoticShiftDeviceService.java
@@ -0,0 +1,29 @@
+package com.gunshi.project.xyt.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeOsmoticShiftDeviceVo;
+import com.gunshi.project.xyt.mapper.OsmoticShiftDeviceMapper;
+import com.gunshi.project.xyt.model.OsmoticShiftDevice;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * 描述: 位移监测记录表
+ * author: xusan
+ * date: 2024-07-08 17:30:37
+ */
+@Service
+@Slf4j
+@Transactional(rollbackFor = Exception.class)
+public class OsmoticShiftDeviceService extends ServiceImpl<OsmoticShiftDeviceMapper, OsmoticShiftDevice>
+{
+
+    public List<HomeOsmoticShiftDeviceVo> getDetailsAndMonitoringDataList() {
+        return baseMapper.getDetailsAndMonitoringDataList();
+    }
+}
+
+
diff --git a/src/main/java/com/gunshi/project/xyt/service/ShpPlacementService.java b/src/main/java/com/gunshi/project/xyt/service/ShpPlacementService.java
index bddd50c..16dcd89 100644
--- a/src/main/java/com/gunshi/project/xyt/service/ShpPlacementService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/ShpPlacementService.java
@@ -1,13 +1,14 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.vo.HomeShpPlacementVo;
 import com.gunshi.project.xyt.mapper.ShpPlacementMapper;
 import com.gunshi.project.xyt.model.ShpPlacement;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: 安置点
@@ -20,6 +21,9 @@ import java.util.Date;
 public class ShpPlacementService extends ServiceImpl<ShpPlacementMapper, ShpPlacement>
 {
 
+    public List<HomeShpPlacementVo> getDetailsAndMonitoringDataLis() {
+        return baseMapper.getDetailsAndMonitoringDataList();
+    }
 }
 
 
diff --git a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
index 291530a..340af58 100644
--- a/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/StStbprpBService.java
@@ -1,13 +1,15 @@
 package com.gunshi.project.xyt.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gunshi.project.xyt.entity.so.HomeStStbprpBSo;
+import com.gunshi.project.xyt.entity.vo.HomeStStbprpBVo;
 import com.gunshi.project.xyt.mapper.StStbprpBMapper;
 import com.gunshi.project.xyt.model.StStbprpB;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
+import java.util.List;
 
 /**
  * 描述: sttp 以水利标准来
@@ -20,6 +22,15 @@ import java.util.Date;
 public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB>
 {
 
+    public List<HomeStStbprpBVo> rainfallStationDetailsList(HomeStStbprpBSo dto) {
+        return baseMapper.rainfallStationDetailsList(dto);
+    }
+    public List<HomeStStbprpBVo> reservoirStationDetailsList() {
+        return baseMapper.reservoirStationDetailsList();
+    }
+    public List<HomeStStbprpBVo> flowStationDetailsList() {
+        return baseMapper.flowStationDetailsList();
+    }
 }