diff --git a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBMapper.java b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBMapper.java
index 2f39ae3..b26ec63 100644
--- a/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBMapper.java
+++ b/module-common/src/main/java/com/gunshi/project/hsz/common/mapper/StStbprpBMapper.java
@@ -26,7 +26,9 @@ public interface StStbprpBMapper extends BaseMapper<StStbprpB> {
 
     @Select("""
             select * from public.st_stbprp_b b
-            where b.sttp='RR'
+            join  public.st_stbprp_b_elem e
+            on b.stcd =e.stcd
+            where e.elem = 'rz'
             """)
     List<StStbprpB> getRsvrStations();
 
diff --git a/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java b/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java
index 4b97c30..eef2b6e 100644
--- a/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java
+++ b/src/main/java/com/gunshi/project/hsz/controller/WarningRuleController.java
@@ -4,6 +4,7 @@ package com.gunshi.project.hsz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 import com.gunshi.core.session.entity.SessionUser;
+import com.gunshi.project.hsz.common.model.StStbprpB;
 import com.gunshi.project.hsz.common.validate.markers.Update;
 import com.gunshi.project.hsz.entity.so.TermiteSurveyPageSo;
 import com.gunshi.project.hsz.entity.so.WarningRulePageSo;
@@ -11,17 +12,22 @@ import com.gunshi.project.hsz.model.TermiteSurvey;
 import com.gunshi.project.hsz.model.WarningRule;
 import com.gunshi.project.hsz.model.WarningRuleInfo;
 import com.gunshi.project.hsz.model.WaterAlarm;
+import com.gunshi.project.hsz.service.HisWaterDataService;
+import com.gunshi.project.hsz.service.StStbprpBService;
 import com.gunshi.project.hsz.service.WarningRuleInfoService;
 import com.gunshi.project.hsz.service.WarningRuleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
+import org.hibernate.validator.constraints.NotEmpty;
 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.time.Year;
+import java.util.List;
 
 @Tag(name = "预警规则")
 @RestController
@@ -76,6 +82,32 @@ public class WarningRuleController extends AbstractCommonFileController {
         return R.ok(warningRuleInfoService.pageQuery(page));
     }
 
+    //获取水位站测点
+    @Operation(summary = "获取水位站测点")
+    @GetMapping("/getRsvrStcd")
+    public R<List<StStbprpB>> gerRsvrOrRiverStcd(){
+        return R.ok(stStbprpBService.getRsvrStations());
+    }
+
+    //获取降雨量测点
+
+    @Autowired
+    private StStbprpBService stStbprpBService;
+
+    @Operation(summary = "获取降雨量测点")
+    @GetMapping("/getRainStcd")
+    public R<List<StStbprpB>> gerRainStcd(){
+        return R.ok(stStbprpBService.getPptnStations());
+    }
+
+    @Autowired
+    private HisWaterDataService hisWaterDataService;
+
+    @Operation(summary = "获取年份")
+    @GetMapping("/getYear")
+    public R<List<Integer>> getYear(){
+        return R.ok(hisWaterDataService.getYearList());
+    }
 
     @Override
     public String getGroupId() {
diff --git a/src/main/java/com/gunshi/project/hsz/mapper/HisWaterDataMapper.java b/src/main/java/com/gunshi/project/hsz/mapper/HisWaterDataMapper.java
index 16e7841..2a25ade 100644
--- a/src/main/java/com/gunshi/project/hsz/mapper/HisWaterDataMapper.java
+++ b/src/main/java/com/gunshi/project/hsz/mapper/HisWaterDataMapper.java
@@ -36,4 +36,10 @@ public interface HisWaterDataMapper extends BaseMapper<HisWaterData> {
 """)
     List<HisWaterDataVo> selectYearList(@Param("dto") ExportCommonDto dto);
 
+    @Select("""
+    select year from his_water_data where type = 1
+    order by year desc
+""")
+    List<Integer> selectYear();
+
 }
diff --git a/src/main/java/com/gunshi/project/hsz/service/HisWaterDataService.java b/src/main/java/com/gunshi/project/hsz/service/HisWaterDataService.java
index b86b701..a559c72 100644
--- a/src/main/java/com/gunshi/project/hsz/service/HisWaterDataService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/HisWaterDataService.java
@@ -193,4 +193,8 @@ public class HisWaterDataService extends ServiceImpl<HisWaterDataMapper, HisWate
         }
         return hisWaterDataVos;
     }
+
+    public List<Integer> getYearList() {
+        return this.baseMapper.selectYear();
+    }
 }
diff --git a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java
index 8a2c45e..5fcbf4b 100644
--- a/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/StStbprpBService.java
@@ -482,6 +482,7 @@ public class StStbprpBService extends ServiceImpl<StStbprpBMapper, StStbprpB> {
     public List<StStbprpB> getRsvrStations() {
         return baseMapper.getRsvrStations();
     }
+
 }
 
 
diff --git a/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java b/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java
index 8c1ffb6..20e2fb1 100644
--- a/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/WarningConditionService.java
@@ -1,6 +1,7 @@
 package com.gunshi.project.hsz.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.project.hsz.mapper.WarningConditionMapper;
 import com.gunshi.project.hsz.mapper.WarningRuleMapper;
@@ -66,4 +67,11 @@ public class WarningConditionService extends ServiceImpl<WarningConditionMapper,
         queryWrapper.eq(WarningCondition::getRuleId,ruleId);
         return this.remove(queryWrapper);
     }
+
+    public boolean deleteData(Long ruleId) {
+        LambdaQueryWrapper<WarningCondition> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WarningCondition::getRuleId,ruleId);
+        boolean remove = this.remove(queryWrapper);
+        return remove;
+    }
 }
diff --git a/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java b/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java
index 393d6b9..e987a35 100644
--- a/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java
+++ b/src/main/java/com/gunshi/project/hsz/service/WarningRuleService.java
@@ -88,8 +88,7 @@ public class WarningRuleService extends ServiceImpl<WarningRuleMapper, WarningRu
             }
             condition.setRuleId(dto.getId());
         }
-        LambdaQueryChainWrapper<WarningCondition> eq = warningConditionService.lambdaQuery().eq(WarningCondition::getRuleId, dto.getId());
-        boolean remove = warningConditionService.remove(eq);
+        boolean remove = warningConditionService.deleteData(dto.getId());
         if(remove){
             warningConditionService.updateBatchById(conditions);
         }