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 +}