From c6a5148ac6513886e6272c133b1557444ab59278 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sun, 29 Mar 2026 19:26:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A7=E5=88=B6=E5=BC=80=E5=85=B3?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B8=89=E7=9B=B8=E7=94=B5=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceSwitchServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java index 1f1d714..759dc66 100644 --- a/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java +++ b/intc-modules/intc-fishery/src/main/java/com/intc/fishery/service/impl/DeviceSwitchServiceImpl.java @@ -367,10 +367,10 @@ public class DeviceSwitchServiceImpl implements IDeviceSwitchService { data.setPondInfo(pondInfo); } - // 如果接线方式为4，需要将电压值乘以1.732 - if (data.getConnectVoltageType() != null && data.getConnectVoltageType() == 4 && data.getDetectVoltageValue() != null) { - data.setDetectVoltageValue(data.getDetectVoltageValue() * 1.732); - } +// // 如果接线方式为4，需要将电压值乘以1.732 +// if (data.getConnectVoltageType() != null && data.getConnectVoltageType() == 4 && data.getDetectVoltageValue() != null) { +// data.setDetectVoltageValue(data.getDetectVoltageValue() * 1.732); +// } return data; } @@ -405,7 +405,7 @@ public class DeviceSwitchServiceImpl implements IDeviceSwitchService { baseMapper.updateById(updateEntity); // 记录操作日志 - log.info("开关操作：{}({})的开关{}修改名称为：{}", + log.info("开关操作：{}({})的开关{}修改名称为：{}", vo.getDeviceName(), vo.getSerialNum(), oldName, newName); } @@ -444,7 +444,7 @@ public class DeviceSwitchServiceImpl implements IDeviceSwitchService { // 记录操作日志 String operation = isOpen == 1 ? "开启" : "关闭"; - log.info("开关操作：{}({})的开关{}，设置电流告警开关：{}", + log.info("开关操作：{}({})的开关{}，设置电流告警开关：{}", vo.getDeviceName(), vo.getSerialNum(), vo.getSwitchName(), operation); } -} \ No newline at end of file +}