diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java index 50ab565f5..fe3fd8b83 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java @@ -36,7 +36,7 @@ public class SupervisionTempDeviceReportParam { * 0 关联系统内变电站;1用户手动输入变电站 */ @ApiModelProperty(value = " 0 关联系统内变电站;1用户手动输入变电站") - private Integer customSubstaionflag; + private Integer customSubstationFlag; /** * 所属变电站 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java index e21855226..8ceb39ce8 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java @@ -35,8 +35,8 @@ public class SupervisionTempDeviceReport { /** * 0 关联系统内变电站;1用户手动输入变电站 */ - @TableField(value = "custom_substaion_flag") - private Integer customSubstaionflag; + @TableField(value = "custom_substation_flag") + private Integer customSubstationFlag; /** diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java index 0c09383ec..95328edcf 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java @@ -246,7 +246,7 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl data = lineFeignClient.getBaseLineList(Stream.of(tempDevice.getSubstation()).collect(Collectors.toList())).getData(); String pids = data.get(0).getPids(); String[] idsArray = pids.split(",");