From 6b3d33ff6bc1d6a2f95ed02ed53865fef1bf14e7 Mon Sep 17 00:00:00 2001 From: xiaojinfei <378266566@qq.com> Date: Thu, 8 Jan 2026 08:42:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A2=84=E8=AD=A6=E9=85=8D=E7=BD=AE&&?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/instant/InstantController.java | 7 +++++++ .../alert/dal/mysql/instant/InstantMapper.java | 15 +++++++++++++++ .../alert/service/instant/InstantService.java | 11 +++++++++++ .../alert/service/instant/InstantServiceImpl.java | 5 +++++ 4 files changed, 38 insertions(+) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java index 36401a5..5ceef92 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java @@ -40,6 +40,13 @@ public class InstantController { return success(BeanUtils.toBean(pageResult, InstantRespVO.class)); } + @GetMapping("/list") + @Operation(summary = "获得模型实例不分页列表") +// @PreAuthorize("@ss.hasPermission('run:instant:list')") + public CommonResult> getInstantList(@Valid InstantReqVO reqVO) { + List listResult = instantService.getInstantList(reqVO); + return success(BeanUtils.toBean(listResult, InstantRespVO.class)); + } @GetMapping("/get") @Operation(summary = "获得实例信息") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java index ac819e3..08d097e 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java @@ -4,9 +4,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantPageReqVO; +import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantReqVO; import cn.iocoder.yudao.module.alert.dal.dataobject.instant.InstantDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface InstantMapper extends BaseMapperX { @@ -23,7 +26,19 @@ public interface InstantMapper extends BaseMapperX { .eqIfPresent(InstantDO::getAlgorithmId,reqVO.getAlgorithmId()) .orderByAsc(InstantDO::getMpId)); } + default List selectList(InstantReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .likeIfPresent(InstantDO::getMpName, reqVO.getMpName()) + .eqIfPresent(InstantDO::getIsUpdate,reqVO.getIsUpdate()) + .eqIfPresent(InstantDO::getRunning,reqVO.getRunning()) + .eqIfPresent(InstantDO::getRunningLog,reqVO.getRunningLog()) + .eqIfPresent(InstantDO::getUnitId,reqVO.getUnit()) + .eqIfPresent(InstantDO::getSystemTypeId,reqVO.getType()) + .eqIfPresent(InstantDO::getSystemId,reqVO.getSystem()) + .eqIfPresent(InstantDO::getAlgorithmId,reqVO.getAlgorithmId()) + .orderByAsc(InstantDO::getMpId)); + } default Long selectCountByRunningLog(String runningLog){ return selectCount(InstantDO::getRunningLog,runningLog); } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java index 1a97116..ede0e2c 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.alert.controller.admin.exa.vo.EXAHistoryReqVO; import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.*; import cn.iocoder.yudao.module.alert.dal.dataobject.instant.InstantDO; +import cn.iocoder.yudao.module.alert.dal.dataobject.warn.AlarmLevelDO; import jakarta.validation.Valid; import java.io.IOException; @@ -17,6 +18,16 @@ public interface InstantService { * @return 模型实例分页结果 */ PageResult getInstantPage(InstantPageReqVO reqVO); + + + /** + * 获得模型实例列表 + * + * @return 模型实例列表-不分页 + */ + List getInstantList(InstantReqVO reqVO); + + /** * 获得模型实例所用测点信息 * diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java index 09df181..61aaf1f 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java @@ -426,6 +426,11 @@ public class InstantServiceImpl implements InstantService { return instantMapper.selectPage(reqVO); } + @Override + public List getInstantList(InstantReqVO reqVO) { + + return instantMapper.selectList(reqVO); + } @Override public InstantDO getInstant(Long id) {