diff --git a/src/main/java/com/gunshi/project/hsz/controller/AlarmSetController.java b/src/main/java/com/gunshi/project/hsz/controller/AlarmSetController.java index c640fd4..4c6a978 100644 --- a/src/main/java/com/gunshi/project/hsz/controller/AlarmSetController.java +++ b/src/main/java/com/gunshi/project/hsz/controller/AlarmSetController.java @@ -38,7 +38,8 @@ public class AlarmSetController { @Operation(summary = "修改") @PostMapping("/update") public R update(@Validated(Update.class) @RequestBody AlarmSet dto) { - boolean result = service.updateById(dto); + boolean result = service.updateInfo(dto); + //boolean result = service.updateById(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/AlarmSetPageSo.java b/src/main/java/com/gunshi/project/hsz/entity/so/AlarmSetPageSo.java index da9db1a..01ea8f5 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/so/AlarmSetPageSo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/so/AlarmSetPageSo.java @@ -13,6 +13,6 @@ public class AlarmSetPageSo { @Schema(description = "分页参数") private PageSo pageSo; - @Schema(description = "测点名称") - private String name; + @Schema(description = "测点编号") + private String stcd; } diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/WaterAlarmPageSo.java b/src/main/java/com/gunshi/project/hsz/entity/so/WaterAlarmPageSo.java index 583d99d..33137db 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/so/WaterAlarmPageSo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/so/WaterAlarmPageSo.java @@ -14,8 +14,8 @@ public class WaterAlarmPageSo { @Schema(description = "分页参数") private PageSo pageSo; - @Schema(description = "测点名称") - private String name; + @Schema(description = "测点编号") + private String stcd; @Schema(description = "告警类型") private Integer type; diff --git a/src/main/java/com/gunshi/project/hsz/service/AlarmSetService.java b/src/main/java/com/gunshi/project/hsz/service/AlarmSetService.java index 86a906f..613c2ea 100644 --- a/src/main/java/com/gunshi/project/hsz/service/AlarmSetService.java +++ b/src/main/java/com/gunshi/project/hsz/service/AlarmSetService.java @@ -21,8 +21,8 @@ import java.util.List; public class AlarmSetService extends ServiceImpl { public Page queryPage(AlarmSetPageSo page) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (page.getName() != null) { - queryWrapper.like(AlarmSet::getStcd, page.getName()); + if (page.getStcd() != null) { + queryWrapper.eq(AlarmSet::getStcd, page.getStcd()); } queryWrapper.orderByDesc(AlarmSet::getCreateDate); Page alarmSetPage = this.baseMapper.selectPage(page.getPageSo().toPage(), queryWrapper); @@ -44,4 +44,15 @@ public class AlarmSetService extends ServiceImpl { public List listStation() { return this.baseMapper.listStation(); } + + public boolean updateInfo(AlarmSet dto) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.ne(AlarmSet::getId, dto.getId()); + queryWrapper.eq(AlarmSet::getStcd, dto.getStcd()); + AlarmSet alarmSet = this.baseMapper.selectOne(queryWrapper); + if(alarmSet != null){ + throw new IllegalArgumentException("对不起站点:" + dto.getStcd() +"已存在"); + } + return updateById(dto); + } } diff --git a/src/main/java/com/gunshi/project/hsz/service/WaterAlarmService.java b/src/main/java/com/gunshi/project/hsz/service/WaterAlarmService.java index fccfec6..096cc9a 100644 --- a/src/main/java/com/gunshi/project/hsz/service/WaterAlarmService.java +++ b/src/main/java/com/gunshi/project/hsz/service/WaterAlarmService.java @@ -33,8 +33,8 @@ public class WaterAlarmService extends ServiceImpl public Page queryPage(WaterAlarmPageSo pageSo) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (pageSo.getName() != null) { - queryWrapper.like(WaterAlarm::getStnm,pageSo.getName()); + if (pageSo.getStcd() != null) { + queryWrapper.eq(WaterAlarm::getStcd,pageSo.getStcd()); } if(pageSo.getType() != null){ queryWrapper.eq(WaterAlarm::getAlarmType,pageSo.getType());