From ed491d368fb511ad9dc5b568b92cecbb56c3d057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= Date: Fri, 11 Apr 2025 13:21:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BusiEqmWarningServiceImpl.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java index 6b1160e..8a49951 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java @@ -338,8 +338,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { } } - } - if(BusiConstant.EqType.EQ_TYPE1.equals(warning.getEqType())) + } else if(BusiConstant.EqType.EQ_TYPE1.equals(warning.getEqType())) { if (BusiConstant.GzType.GZ_TYPE9.equals(warning.getGzType())) { warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getMainTreeId() ,warning.getSensorCode(), warning.getEqType(), warning.getGzType())); @@ -353,8 +352,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { } } - } - if(BusiConstant.EqType.EQ_TYPE2.equals(warning.getEqType())) + } else if(BusiConstant.EqType.EQ_TYPE2.equals(warning.getEqType())) { if(!StringUtils.isEmpty(warning.getSensorCode())){ if(warning.getSensorCode().equals("GISPD")){ warning.setSensorName("GIS局部放电诊断"); @@ -372,8 +370,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { } } - } - if(BusiConstant.EqType.EQ_TYPE3.equals(warning.getEqType())) + } else if(BusiConstant.EqType.EQ_TYPE3.equals(warning.getEqType())) { if(warning.getSensorCode().equals("switch")){ warning.setSensorName("开关柜机械故障诊断"); @@ -383,24 +380,21 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { warning.setSensorName(sensorCode.getSensorName()); warning.setPosition(sensorCode.getPosition()); } - } - if(BusiConstant.EqType.EQ_TYPE4.equals(warning.getEqType())) + } else if(BusiConstant.EqType.EQ_TYPE4.equals(warning.getEqType())) { if(!StringUtils.isEmpty(warning.getSensorCode())) { BusiTemperPoint sensorCode = busiTemperPointService.findSensorBySensorCode(warning.getSensorCode()); warning.setSensorName(sensorCode.getSensorName()); warning.setPosition(sensorCode.getPosition()); } - } - if(BusiConstant.EqType.EQ_TYPE5.equals(warning.getEqType())) + } else if(BusiConstant.EqType.EQ_TYPE5.equals(warning.getEqType())) { if(!StringUtils.isEmpty(warning.getSensorCode())) { BusiOtherSensor sensorCode = busiOtherSensorService.findSensorBySensorCode(warning.getSensorCode()); warning.setSensorName(sensorCode.getSensorName()); warning.setPosition(sensorCode.getPosition()); } - } - if(Objects.equals(BusiConstant.EqType.EQ_TYPE6, warning.getEqType())){ + } else if(Objects.equals(BusiConstant.EqType.EQ_TYPE6, warning.getEqType())){ if(warning.getSensorCode().equals("Generator")){ warning.setSensorName("发电机定子绝缘状态"); warning.setPosition("/"); @@ -409,8 +403,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { // warning.setSensorName(busiGeneratorSensor.getSensorName()); // warning.setPosition(busiGeneratorSensor.getPosition()); } - } - if(Objects.equals(BusiConstant.EqType.EQ_TYPE7, warning.getEqType())){ + } else if(Objects.equals(BusiConstant.EqType.EQ_TYPE7, warning.getEqType())){ if(warning.getSensorCode().equals("Cable")){ warning.setSensorName("电缆故障诊断"); warning.setPosition("/");