diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java index bbba325bf..cb444a5c5 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsStatationStatController.java @@ -162,7 +162,7 @@ public class PmsStatationStatController extends BaseController { @ApiImplicitParam(name = "param", value = "条件参数", required = true) }) public HttpResult> getPowerInfo(@RequestBody PmsStatationStatInfoParam param) { - String methodDescribe = getMethodDescribe("getStatationStatInfo"); + String methodDescribe = getMethodDescribe("getPowerInfo"); List powerInfo = statationStatService.getPowerInfo(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, powerInfo, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java index 623be0954..3b60cdb01 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LineParam.java @@ -26,7 +26,7 @@ public class LineParam { @ApiModelProperty(name = "name",value = "监测点名称",required = true) @NotBlank(message = "监测点名称不可为空") - @Pattern(regexp = PatternRegex.DEV_NAME_REGEX,message = "监测点名称违规") + //@Pattern(regexp = PatternRegex.DEV_NAME_REGEX,message = "监测点名称违规") private String name; @ApiModelProperty(name = "name",value = "原监测点名称",required = true)