parent
90612356eb
commit
26a590030a
|
|
@ -38,7 +38,8 @@ public class AlarmSetController {
|
||||||
@Operation(summary = "修改")
|
@Operation(summary = "修改")
|
||||||
@PostMapping("/update")
|
@PostMapping("/update")
|
||||||
public R<AlarmSet> update(@Validated(Update.class) @RequestBody AlarmSet dto) {
|
public R<AlarmSet> 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);
|
return R.ok(result ? dto : null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,6 @@ public class AlarmSetPageSo {
|
||||||
@Schema(description = "分页参数")
|
@Schema(description = "分页参数")
|
||||||
private PageSo pageSo;
|
private PageSo pageSo;
|
||||||
|
|
||||||
@Schema(description = "测点名称")
|
@Schema(description = "测点编号")
|
||||||
private String name;
|
private String stcd;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ public class WaterAlarmPageSo {
|
||||||
@Schema(description = "分页参数")
|
@Schema(description = "分页参数")
|
||||||
private PageSo pageSo;
|
private PageSo pageSo;
|
||||||
|
|
||||||
@Schema(description = "测点名称")
|
@Schema(description = "测点编号")
|
||||||
private String name;
|
private String stcd;
|
||||||
|
|
||||||
@Schema(description = "告警类型")
|
@Schema(description = "告警类型")
|
||||||
private Integer type;
|
private Integer type;
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ import java.util.List;
|
||||||
public class AlarmSetService extends ServiceImpl<AlarmSetMapper, AlarmSet> {
|
public class AlarmSetService extends ServiceImpl<AlarmSetMapper, AlarmSet> {
|
||||||
public Page<AlarmSet> queryPage(AlarmSetPageSo page) {
|
public Page<AlarmSet> queryPage(AlarmSetPageSo page) {
|
||||||
LambdaQueryWrapper<AlarmSet> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<AlarmSet> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (page.getName() != null) {
|
if (page.getStcd() != null) {
|
||||||
queryWrapper.like(AlarmSet::getStcd, page.getName());
|
queryWrapper.eq(AlarmSet::getStcd, page.getStcd());
|
||||||
}
|
}
|
||||||
queryWrapper.orderByDesc(AlarmSet::getCreateDate);
|
queryWrapper.orderByDesc(AlarmSet::getCreateDate);
|
||||||
Page<AlarmSet> alarmSetPage = this.baseMapper.selectPage(page.getPageSo().toPage(), queryWrapper);
|
Page<AlarmSet> alarmSetPage = this.baseMapper.selectPage(page.getPageSo().toPage(), queryWrapper);
|
||||||
|
|
@ -44,4 +44,15 @@ public class AlarmSetService extends ServiceImpl<AlarmSetMapper, AlarmSet> {
|
||||||
public List<StStbprpB> listStation() {
|
public List<StStbprpB> listStation() {
|
||||||
return this.baseMapper.listStation();
|
return this.baseMapper.listStation();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean updateInfo(AlarmSet dto) {
|
||||||
|
LambdaQueryWrapper<AlarmSet> 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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,8 @@ public class WaterAlarmService extends ServiceImpl<WaterAlarmMapper, WaterAlarm>
|
||||||
|
|
||||||
public Page<WaterAlarm> queryPage(WaterAlarmPageSo pageSo) {
|
public Page<WaterAlarm> queryPage(WaterAlarmPageSo pageSo) {
|
||||||
LambdaQueryWrapper<WaterAlarm> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<WaterAlarm> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (pageSo.getName() != null) {
|
if (pageSo.getStcd() != null) {
|
||||||
queryWrapper.like(WaterAlarm::getStnm,pageSo.getName());
|
queryWrapper.eq(WaterAlarm::getStcd,pageSo.getStcd());
|
||||||
}
|
}
|
||||||
if(pageSo.getType() != null){
|
if(pageSo.getType() != null){
|
||||||
queryWrapper.eq(WaterAlarm::getAlarmType,pageSo.getType());
|
queryWrapper.eq(WaterAlarm::getAlarmType,pageSo.getType());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue