From c1dca815e756a9707629dfee07452643c260381a Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 11 Sep 2025 09:38:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/supervision/pojo/param/databank/LibModelParam.java | 2 ++ .../supervision/service/databank/impl/LibModelServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/databank/LibModelParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/databank/LibModelParam.java index ebc107b99..0a5bae457 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/databank/LibModelParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/databank/LibModelParam.java @@ -165,6 +165,8 @@ public class LibModelParam extends BaseEntity { @EqualsAndHashCode(callSuper = true) public static class LibModelParamQuery extends BaseParam { + @ApiModelProperty("0谐波抗阻，1谐波源") + private Integer type; } } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibModelServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibModelServiceImpl.java index 204d51783..ec34e713e 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibModelServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/databank/impl/LibModelServiceImpl.java @@ -47,6 +47,7 @@ public class LibModelServiceImpl extends ServiceImpl i public Page page(LibModelParam.LibModelParamQuery param) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(LibModel::getStatus,DataStateEnum.ENABLE.getCode()); + queryWrapper.eq(LibModel::getType,param.getType()); //添加上时间范围 queryWrapper.like(StrUtil.isNotBlank(param.getSearchValue()),LibModel::getName,param.getSearchValue()); if(StrUtil.isNotBlank(param.getSearchBeginTime())&&StrUtil.isNotBlank(param.getSearchEndTime())){