From 0661fd6bdc4e88c4889d7a61f025330cb950d00b Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 22 May 2024 17:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E6=94=AF=E6=A8=A1=E6=B5=8B=E9=87=8F?= =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E5=92=8C=E6=B5=8B=E9=87=8F=E7=82=B9?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E5=88=A4=E6=96=AD=E5=94=AF=E4=B8=80=E5=AD=98?= =?UTF-8?q?=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HighFormworkMeasureCurrentData.java | 4 +++ ...FormworkMeasureCurrentDataServiceImpl.java | 4 ++- .../HighFormworkMeasurePointServiceImpl.java | 32 +++++++++++-------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java index 04eb3264a..a59668039 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java @@ -88,4 +88,8 @@ public class HighFormworkMeasureCurrentData implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "测量点名称") private java.lang.String measurePointName; + + @TableField(exist = false) + @ApiModelProperty(value = "采集仪编号") + private java.lang.String acquisitionInstrumentNumber; } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java index 8c99ed8ea..98ce9e97c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java @@ -55,7 +55,9 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl 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); if (point == null) { throw new OpenAlertException(MessageUtil.get("pointNoErr")); diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java index 6c4b27371..fe17a9d25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java @@ -50,16 +50,18 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber()); - int count=highFormworkMeasurePointMapper.selectCount(queryWrapper); - if(count>0){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda() + .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber()) + .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber()); + int count = highFormworkMeasurePointMapper.selectCount(queryWrapper); + if (count > 0) { throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); } highFormworkMeasurePoint.setRealTime(new Date()); highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint); - if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){ - for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){ + if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) { + for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) { threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); highFormworkMeasurePointThresholdMapper.insert(threshold); } @@ -68,18 +70,20 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); - queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber,highFormworkMeasurePoint.getMeasurePointNumber()) - .ne(HighFormworkMeasurePoint::getId,highFormworkMeasurePoint.getId()); - int count=highFormworkMeasurePointMapper.selectCount(queryWrapper); - if(count>0){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda() + .eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber()) + .eq(HighFormworkMeasurePoint::getAcquisitionInstrumentNumber, highFormworkMeasurePoint.getAcquisitionInstrumentNumber()) + .ne(HighFormworkMeasurePoint::getId, highFormworkMeasurePoint.getId()); + int count = highFormworkMeasurePointMapper.selectCount(queryWrapper); + if (count > 0) { throw new OpenAlertException(MessageUtil.get("pointNoExistErr")); } highFormworkMeasurePoint.setRealTime(null); highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint); - if(highFormworkMeasurePoint.getThresholdList()!=null&&highFormworkMeasurePoint.getThresholdList().size()>0){ - for (HighFormworkMeasurePointThreshold threshold:highFormworkMeasurePoint.getThresholdList()){ - if(threshold.getId()!=null){ + if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) { + for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) { + if (threshold.getId() != null) { threshold.setMeasurePointId(highFormworkMeasurePoint.getId()); highFormworkMeasurePointThresholdMapper.updateById(threshold); }else {