qdintc/fishery-back
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 编辑设备输入端接线方式接口bug修复。

Browse Source
This commit is contained in:
tianyongbao
2026-03-31 13:36:31 +08:00
parent 62b305855b
commit 75fa70184c
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
intc-modules/intc-iot/src/main/java/com/intc/iot/handler/DeviceDataHandler.java
View File

@@ -1385,9 +1385,9 @@ public class DeviceDataHandler {
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw != null && sw.getPondId() != null) String swPondName = (sw != null && sw.getPondId() != null)
? getPondName(sw.getPondId()) : pondName; ? getPondName(sw.getPondId()) : pondName;
String swName = sw != null && sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw != null && sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u7f3a\u76f8"; title = "控制器开关输出缺相";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa\u7f3a%s\u76f8", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出缺%s相",
swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName); swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName);
} }
} else if (errorCode >= DefineDeviceErrorCode.Three_Switch1OverElectricA } else if (errorCode >= DefineDeviceErrorCode.Three_Switch1OverElectricA
@@ -1401,9 +1401,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u8fc7\u6d41"; title = "控制器开关输出过流";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa%s\u76f8\u8fc7\u6d41", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出%s相过流",
swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName); swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName);
} }
} else if (errorCode >= DefineDeviceErrorCode.Three_Switch1UnderElectricA } else if (errorCode >= DefineDeviceErrorCode.Three_Switch1UnderElectricA
@@ -1417,9 +1417,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u6b20\u6d41"; title = "控制器开关输出欠流";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa%s\u76f8\u6b20\u6d41", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出%s相欠流",
swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName); swPondName, displayName, device.getSerialNum(), switchIndex, swName, phaseName);
} }
} else if (errorCode >= DefineDeviceErrorCode.Three_Switch1ElectricEmpty } else if (errorCode >= DefineDeviceErrorCode.Three_Switch1ElectricEmpty
@@ -1431,9 +1431,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u7a7a\u8f7d"; title = "控制器开关输出空载";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa\u7a7a\u8f7d", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出空载",
swPondName, displayName, device.getSerialNum(), switchIndex, swName); swPondName, displayName, device.getSerialNum(), switchIndex, swName);
} }
} else if (errorCode >= DefineDeviceErrorCode.One_Switch1OverElectric } else if (errorCode >= DefineDeviceErrorCode.One_Switch1OverElectric
@@ -1445,9 +1445,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u8fc7\u6d41"; title = "控制器开关输出过流";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa\u8fc7\u6d41", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出过流",
swPondName, displayName, device.getSerialNum(), switchIndex, swName); swPondName, displayName, device.getSerialNum(), switchIndex, swName);
} }
} else if (errorCode >= DefineDeviceErrorCode.One_Switch1UnderElectric } else if (errorCode >= DefineDeviceErrorCode.One_Switch1UnderElectric
@@ -1459,9 +1459,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u6b20\u6d41"; title = "控制器开关输出欠流";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa\u6b20\u6d41", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出欠流",
swPondName, displayName, device.getSerialNum(), switchIndex, swName); swPondName, displayName, device.getSerialNum(), switchIndex, swName);
} }
} else if (errorCode >= DefineDeviceErrorCode.One_Switch1ElectricEmpty } else if (errorCode >= DefineDeviceErrorCode.One_Switch1ElectricEmpty
@@ -1473,9 +1473,9 @@ public class DeviceDataHandler {
warnTrigger = warnTrigger && electricWarnOpen; warnTrigger = warnTrigger && electricWarnOpen;
if (warnTrigger) { if (warnTrigger) {
String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName; String swPondName = (sw.getPondId() != null) ? getPondName(sw.getPondId()) : pondName;
String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("\u5f00\u5173" + switchIndex); String swName = sw.getSwitchName() != null ? sw.getSwitchName() : ("开关" + switchIndex);
title = "\u63a7\u5236\u5668\u5f00\u5173\u8f93\u51fa\u7a7a\u8f7d"; title = "控制器开关输出空载";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u7684\u5f00\u5173%d(%s)\u8f93\u51fa\u7a7a\u8f7d", message = String.format("%s塘口中%s(%s)的开关%d(%s)输出空载",
swPondName, displayName, device.getSerialNum(), switchIndex, swName); swPondName, displayName, device.getSerialNum(), switchIndex, swName);
} }
} else if (errorCode == DefineDeviceErrorCode.PowerOff) { } else if (errorCode == DefineDeviceErrorCode.PowerOff) {
@@ -1486,8 +1486,8 @@ public class DeviceDataHandler {
// 置位 ErrorPowerOff warnCode // 置位 ErrorPowerOff warnCode
setDeviceWarnCodeBit(device.getSerialNum(), DefineDeviceWarnCode.ErrorPowerOff, true); setDeviceWarnCodeBit(device.getSerialNum(), DefineDeviceWarnCode.ErrorPowerOff, true);
if (warnTrigger) { if (warnTrigger) {
title = "\u63a7\u5236\u5668\u65ad\u7535"; title = "控制器断电";
message = String.format("%s\u5858\u53e3\u4e2d%s(%s)\u65ad\u7535", message = String.format("%s塘口中%s(%s)断电",
pondName, displayName, device.getSerialNum()); pondName, displayName, device.getSerialNum());
} }
} else { } else {

8
intc-modules/intc-iot/src/main/java/com/intc/iot/utils/ControllerHelper.java
View File

@@ -28,16 +28,16 @@ public class ControllerHelper {
// 尝试只设置phase字段 // 尝试只设置phase字段
switch (voltageType) { switch (voltageType) {
case 1: // 220V单相 case 1: // 220V单相
result.put("phase", "1"); result.put("phase", "A");
break; break;
case 2: // 220V两相 case 2: // 220V两相
result.put("phase", "2"); result.put("phase", "B");
break; break;
case 3: // 380V三相 case 3: // 380V三相
result.put("phase", "3"); result.put("phase", "C");
break; break;
case 4: // 380V四相 case 4: // 380V四相
result.put("phase", "4"); result.put("phase", "ABC");
break; break;
default: default:
return null; return null;