Commit 34ae82ca authored by 周昊's avatar 周昊
Browse files

Merge branch 'develop' into 公司测试环境4.221 

# Conflicts:
#	ruoyi-admin/src/main/resources/application.yml
parents 8f6ecebe 1303cda4

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmBaseController.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class AlgorithmBaseController extends BaseController { 
    @PreAuthorize("@ss.hasPermi('system:algorithmBase:query')")

    @GetMapping(value = "/{id}")

    public AjaxResult getInfo(@PathVariable("id") Long id) {

        return success(algorithmBaseService.selectAlgorithmBaseById(id));

        return success(algorithmBaseService.selectAlgorithmBaseListDtoById(id));

    }



    /**

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmBaseTypeController.java

+12 −0
Original line number Diff line number Diff line
@@ -46,6 +46,18 @@ public class AlgorithmBaseTypeController extends BaseController 
        return getDataTable(list);

    }



    /**

     * 查询算法预警类型列表

     */

    @PreAuthorize("@ss.hasPermi('system:type:list')")

    @GetMapping("/list/{algorithmId}")

    public AjaxResult listByAlgorithmBaseId(@PathVariable Long algorithmId)

    {

        AlgorithmBaseType algorithmBaseType = new AlgorithmBaseType();

        algorithmBaseType.setAlgorithmId(algorithmId);

        return success(algorithmBaseTypeService.selectAlgorithmBaseTypeList(algorithmBaseType));

    }



    /**

     * 导出算法预警类型列表

     */

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmPieceBaseController.java

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,16 @@ public class AlgorithmPieceBaseController extends BaseController 
        return getDataTable(list);

    }



    /**

     * 查询策略算法块列表

     */

    @PreAuthorize("@ss.hasPermi('system:algorithmPiece:list')")

    @GetMapping("/list/all")

    public AjaxResult listAll(AlgorithmPieceBase algorithmPieceBase)

    {

        return success(algorithmPieceBaseService.selectAlgorithmPieceBaseList(algorithmPieceBase));

    }



    /**

     * 获取策略算法块详细信息

     */

ruoyi-admin/src/main/java/com/ruoyi/algorithm/mapper/AlgorithmBaseMapper.java

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.ruoyi.algorithm.mapper; 
import java.util.List;

import com.ruoyi.algorithm.domain.AlgorithmBase;

import com.ruoyi.algorithm.domain.dto.AlgorithmBaseListDto;

import org.apache.ibatis.annotations.Param;



/**

 * 算法Mapper接口
@@ -61,4 +62,6 @@ public interface AlgorithmBaseMapper 
    public int deleteAlgorithmBaseByIds(Long[] ids);



    public List<AlgorithmBaseListDto> selectAlgorithmBaseListDto(AlgorithmBase algorithmBase);



    public AlgorithmBaseListDto selectAlgorithmBaseListDtoById(@Param("id") Long id);

}

ruoyi-admin/src/main/java/com/ruoyi/algorithm/service/IAlgorithmBaseService.java

+2 −0
Original line number Diff line number Diff line
@@ -67,4 +67,6 @@ public interface IAlgorithmBaseService 
     * @return 算法集合

     */

    public List<AlgorithmBaseListDto> selectAlgorithmBaseListDto(AlgorithmBase algorithmBase);



    AlgorithmBaseListDto selectAlgorithmBaseListDtoById(Long id);

}