Commit be44a071 authored by 周昊's avatar 周昊
Browse files

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

parents 34ae82ca 2a734e5d

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -61,9 +61,9 @@ public class AlgorithmBaseController extends BaseController { 
    @PreAuthorize("@ss.hasPermi('system:algorithmBase:add')")

    @PreAuthorize("@ss.hasPermi('system:algorithmBase:add')")

    @Log(title = "算法", businessType = BusinessType.INSERT)

    @Log(title = "算法", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping

    public AjaxResult add(@RequestBody AlgorithmBase algorithmBase) {

    public AjaxResult add(@RequestBody AlgorithmBaseListDto algorithmBaseListDto) {

        algorithmBase.setCreateBy(getUsername());

        algorithmBaseListDto.setCreateBy(getUsername());

        return toAjax(algorithmBaseService.insertAlgorithmBase(algorithmBase));

        return toAjax(algorithmBaseService.insertAlgorithmBaseListDto(algorithmBaseListDto));

    }

    }





    /**

    /**
@@ -72,9 +72,9 @@ public class AlgorithmBaseController extends BaseController { 
    @PreAuthorize("@ss.hasPermi('system:algorithmBase:edit')")

    @PreAuthorize("@ss.hasPermi('system:algorithmBase:edit')")

    @Log(title = "算法", businessType = BusinessType.UPDATE)

    @Log(title = "算法", businessType = BusinessType.UPDATE)

    @PutMapping

    @PutMapping

    public AjaxResult edit(@RequestBody AlgorithmBase algorithmBase) {

    public AjaxResult edit(@RequestBody AlgorithmBaseListDto algorithmBaseListDto) {

        algorithmBase.setUpdateBy(getUsername());

        algorithmBaseListDto.setUpdateBy(getUsername());

        return toAjax(algorithmBaseService.updateAlgorithmBase(algorithmBase));

        return toAjax(algorithmBaseService.updateAlgorithmBaseListDto(algorithmBaseListDto));

    }

    }





    /**

    /**

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ public class AlgorithmPieceBaseController extends BaseController 
    @GetMapping(value = "/{id}")

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

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

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

    {

    {

        return success(algorithmPieceBaseService.selectAlgorithmPieceBaseById(id));

        return success(algorithmPieceBaseService.selectAlgorithmPieceListDtoById(id));

    }

    }





    /**

    /**
@@ -74,10 +74,10 @@ public class AlgorithmPieceBaseController extends BaseController 
    @PreAuthorize("@ss.hasPermi('system:algorithmPiece:add')")

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

    @Log(title = "策略算法块", businessType = BusinessType.INSERT)

    @Log(title = "策略算法块", businessType = BusinessType.INSERT)

    @PostMapping

    @PostMapping

    public AjaxResult add(@RequestBody AlgorithmPieceBase algorithmPieceBase)

    public AjaxResult add(@RequestBody AlgorithmPieceListDto algorithmPieceListDto)

    {

    {

        algorithmPieceBase.setCreateBy(getUsername());

        algorithmPieceListDto.setCreateBy(getUsername());

        return toAjax(algorithmPieceBaseService.insertAlgorithmPieceBase(algorithmPieceBase));

        return toAjax(algorithmPieceBaseService.insertAlgorithmPieceListDto(algorithmPieceListDto));

    }

    }





    /**

    /**
@@ -86,10 +86,10 @@ public class AlgorithmPieceBaseController extends BaseController 
    @PreAuthorize("@ss.hasPermi('system:algorithmPiece:edit')")

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

    @Log(title = "策略算法块", businessType = BusinessType.UPDATE)

    @Log(title = "策略算法块", businessType = BusinessType.UPDATE)

    @PutMapping

    @PutMapping

    public AjaxResult edit(@RequestBody AlgorithmPieceBase algorithmPieceBase)

    public AjaxResult edit(@RequestBody AlgorithmPieceListDto algorithmPieceListDto)

    {

    {

        algorithmPieceBase.setUpdateBy(getUsername());

        algorithmPieceListDto.setUpdateBy(getUsername());

        return toAjax(algorithmPieceBaseService.updateAlgorithmPieceBase(algorithmPieceBase));

        return toAjax(algorithmPieceBaseService.updateAlgorithmPieceListDto(algorithmPieceListDto));

    }

    }





    /**

    /**

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/AlgorithmPieceVariable.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; 
 * @author ruoyi

 * @author ruoyi

 * @date 2023-04-26

 * @date 2023-04-26

 */

 */

public class AlgorithmPieceVariable extends BaseEntity

public class AlgorithmPieceVariable

{

{

    private static final long serialVersionUID = 1L;

    private static final long serialVersionUID = 1L;

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmBaseListDto.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,9 @@ public class AlgorithmBaseListDto{ 
    /** 创建时间 */

    /** 创建时间 */

    private Date createTime;

    private Date createTime;





    /** 更新者 */

    private String updateBy;



    /** 排序 */

    /** 排序 */

    private Long sort;

    private Long sort;

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmPieceListDto.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,9 @@ public class AlgorithmPieceListDto { 
    /** 创建者 */

    /** 创建者 */

    private String createBy;

    private String createBy;





    /** 更新者 */

    private String updateBy;



    /** 创建时间 */

    /** 创建时间 */

    private Date createTime;

    private Date createTime;