diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java index 0d74e0eb6..da9078749 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendQueryParam.java @@ -23,18 +23,18 @@ public class SendQueryParam { private String deptIndex; @ApiModelProperty("开始时间") - @Pattern(regexp = PatternRegex.TIME_SECOND_FORMAT, message = "时间格式错误") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") private String searchBeginTime; @ApiModelProperty("结束时间") - @Pattern(regexp = PatternRegex.TIME_SECOND_FORMAT, message = "时间格式错误") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") private String searchEndTime; @Data public static class SendPageParam extends SendQueryParam { @NotNull(message="当前页不能为空!") @Min(value = 1, message = "当前页不能为0") @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) - private Integer currentPage; + private Integer pageNum; /**显示条数*/ @NotNull(message="显示条数不能为空!") @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java index 11a9fae56..cbf6720bc 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java @@ -26,7 +26,7 @@ import java.util.List; /** * Description:河北国网上送接口 - * * 2.4.1.17接收电能质量主配网监测点统计数据接口 + * *2.4.1.18 接收电能质量换流站指标汇总统计数据接口 * Date: 2023/12/13 14:52【需求编号】 * * @author clam @@ -35,7 +35,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/Converterdetail") -@Api(tags = "换流站指标统计明细数据") +@Api(tags = "换流站指标统计明细汇总数据") @RequiredArgsConstructor public class ConverterdetailstatisticsController extends BaseController {