Browse Source

fix:预警配置&&下拉框适配

pull/75/head
xiaojinfei 4 days ago
parent
commit
6b3d33ff6b
  1. 7
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/InstantController.java
  2. 15
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java
  3. 11
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantService.java
  4. 5
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

7
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)); return success(BeanUtils.toBean(pageResult, InstantRespVO.class));
} }
@GetMapping("/list")
@Operation(summary = "获得模型实例不分页列表")
// @PreAuthorize("@ss.hasPermission('run:instant:list')")
public CommonResult<List<InstantRespVO>> getInstantList(@Valid InstantReqVO reqVO) {
List<InstantDO> listResult = instantService.getInstantList(reqVO);
return success(BeanUtils.toBean(listResult, InstantRespVO.class));
}
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得实例信息") @Operation(summary = "获得实例信息")

15
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.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 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.InstantPageReqVO;
import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantReqVO;
import cn.iocoder.yudao.module.alert.dal.dataobject.instant.InstantDO; import cn.iocoder.yudao.module.alert.dal.dataobject.instant.InstantDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper @Mapper
public interface InstantMapper extends BaseMapperX<InstantDO> { public interface InstantMapper extends BaseMapperX<InstantDO> {
@ -23,7 +26,19 @@ public interface InstantMapper extends BaseMapperX<InstantDO> {
.eqIfPresent(InstantDO::getAlgorithmId,reqVO.getAlgorithmId()) .eqIfPresent(InstantDO::getAlgorithmId,reqVO.getAlgorithmId())
.orderByAsc(InstantDO::getMpId)); .orderByAsc(InstantDO::getMpId));
} }
default List<InstantDO> selectList(InstantReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<InstantDO>()
.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){ default Long selectCountByRunningLog(String runningLog){
return selectCount(InstantDO::getRunningLog,runningLog); return selectCount(InstantDO::getRunningLog,runningLog);
} }

11
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.exa.vo.EXAHistoryReqVO;
import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.*; 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.instant.InstantDO;
import cn.iocoder.yudao.module.alert.dal.dataobject.warn.AlarmLevelDO;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.io.IOException; import java.io.IOException;
@ -17,6 +18,16 @@ public interface InstantService {
* @return 模型实例分页结果 * @return 模型实例分页结果
*/ */
PageResult<InstantDO> getInstantPage(InstantPageReqVO reqVO); PageResult<InstantDO> getInstantPage(InstantPageReqVO reqVO);
/**
* 获得模型实例列表
*
* @return 模型实例列表-不分页
*/
List<InstantDO> getInstantList(InstantReqVO reqVO);
/** /**
* 获得模型实例所用测点信息 * 获得模型实例所用测点信息
* *

5
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); return instantMapper.selectPage(reqVO);
} }
@Override
public List<InstantDO> getInstantList(InstantReqVO reqVO) {
return instantMapper.selectList(reqVO);
}
@Override @Override
public InstantDO getInstant(Long id) { public InstantDO getInstant(Long id) {

Loading…
Cancel
Save