From 42c1faa5dca313de78f798dfb010f41af0392450 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 20 Nov 2024 11:00:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=BF=E5=B7=9E=E8=B6=85=E9=AB=98=E5=8E=8B?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/controller/ledgerManger/PmsStatationStatController.java | 2 +- .../src/main/java/com/njcn/device/pq/pojo/param/LineParam.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)