Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

liu

3 天以前 5f612ab2f67b2c6f6894c624a7780799526d566d

 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessExpressionController.java

@@ -1,8 +1,13 @@
package cn.iocoder.yudao.module.bpm.controller.admin.definition;

import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportExcelVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionPageReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionSaveReqVO;
@@ -12,10 +17,15 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.Arrays;
import java.util.List;

import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

@@ -55,7 +65,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得流程表达式")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('bpm:process-expression:query')")
    public CommonResult<BpmProcessExpressionRespVO> getProcessExpression(@RequestParam("id") Long id) {
        BpmProcessExpressionDO processExpression = processExpressionService.getProcessExpression(id);
        return success(BeanUtils.toBean(processExpression, BpmProcessExpressionRespVO.class));
@@ -63,11 +72,31 @@

    @GetMapping("/page")
    @Operation(summary = "获得流程表达式分页")
    @PreAuthorize("@ss.hasPermission('bpm:process-expression:query')")
    public CommonResult<PageResult<BpmProcessExpressionRespVO>> getProcessExpressionPage(
            @Valid BpmProcessExpressionPageReqVO pageReqVO) {
        PageResult<BpmProcessExpressionDO> pageResult = processExpressionService.getProcessExpressionPage(pageReqVO);
        return success(BeanUtils.toBean(pageResult, BpmProcessExpressionRespVO.class));
    }

}
    @GetMapping("/get-import-template")
    @Operation(summary = "获得导入流程表达式模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<BpmProcessExpressionImportExcelVO> list = Arrays.asList(
                BpmProcessExpressionImportExcelVO.builder().name("示例表达式")
                        .status(CommonStatusEnum.ENABLE.getStatus()).expression("${1 == 1}").build()
        );
        // 输出
        ExcelUtils.write(response, "流程表达式导入模板.xls", "流程表达式列表", BpmProcessExpressionImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入流程表达式")
    @PreAuthorize("@ss.hasPermission('bpm:process-expression:import')")
    public CommonResult<BpmProcessExpressionImportRespVO> importExcel(@Valid BpmProcessExpressionImportReqVO importReqVO)
            throws Exception {
        List<BpmProcessExpressionImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), BpmProcessExpressionImportExcelVO.class);
        return success(processExpressionService.importExpressionList(list, importReqVO));
    }

}