高支模测量点名称和测量点编号判断唯一存在

This commit is contained in:
guoshengxiong 2024-05-22 17:56:57 +08:00
parent 03c7733fae
commit 0661fd6bdc
3 changed files with 25 additions and 15 deletions

View File

@ -88,4 +88,8 @@ public class HighFormworkMeasureCurrentData implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "测量点名称") @ApiModelProperty(value = "测量点名称")
private java.lang.String measurePointName; private java.lang.String measurePointName;
@TableField(exist = false)
@ApiModelProperty(value = "采集仪编号")
private java.lang.String acquisitionInstrumentNumber;
} }

View File

@ -55,7 +55,9 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl<HighF
@Override @Override
public void saveHighFormworkMeasureCurrentData(HighFormworkMeasureCurrentData highFormworkMeasureCurrentData) { public void saveHighFormworkMeasureCurrentData(HighFormworkMeasureCurrentData highFormworkMeasureCurrentData) {
QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>(); QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasureCurrentData.getMeasurePointNumber()); queryWrapper.lambda()
.eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasureCurrentData.getMeasurePointNumber())
.eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasureCurrentData.getAcquisitionInstrumentNumber());
HighFormworkMeasurePoint point = highFormworkMeasurePointMapper.selectOne(queryWrapper); HighFormworkMeasurePoint point = highFormworkMeasurePointMapper.selectOne(queryWrapper);
if (point == null) { if (point == null) {
throw new OpenAlertException(MessageUtil.get("pointNoErr")); throw new OpenAlertException(MessageUtil.get("pointNoErr"));

View File

@ -50,16 +50,18 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
@Override @Override
public void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) { public void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
QueryWrapper<HighFormworkMeasurePoint> queryWrapper=new QueryWrapper<>(); QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber()); queryWrapper.lambda()
int count=highFormworkMeasurePointMapper.selectCount(queryWrapper); .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber())
if(count>0){ .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber());
int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
} }
highFormworkMeasurePoint.setRealTime(new Date()); highFormworkMeasurePoint.setRealTime(new Date());
highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint); highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint);
if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){ if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){ for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
highFormworkMeasurePointThresholdMapper.insert(threshold); highFormworkMeasurePointThresholdMapper.insert(threshold);
} }
@ -68,18 +70,20 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
@Override @Override
public void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) { public void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
QueryWrapper<HighFormworkMeasurePoint> queryWrapper=new QueryWrapper<>(); QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber()) queryWrapper.lambda()
.ne(HighFormworkMeasurePoint::getId,highFormworkMeasurePoint.getId()); .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber())
int count=highFormworkMeasurePointMapper.selectCount(queryWrapper); .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber())
if(count>0){ .ne(HighFormworkMeasurePoint::getId, highFormworkMeasurePoint.getId());
int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
} }
highFormworkMeasurePoint.setRealTime(null); highFormworkMeasurePoint.setRealTime(null);
highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint); highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint);
if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){ if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){ for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
if(threshold.getId()!=null){ if (threshold.getId() != null) {
threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
highFormworkMeasurePointThresholdMapper.updateById(threshold); highFormworkMeasurePointThresholdMapper.updateById(threshold);
}else { }else {