流程配置

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/FlowGroupController.java

@@ -9,20 +9,27 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.server.controller.admin.vo.FlowGroupPageReqVO;
 import cn.iocoder.yudao.server.controller.admin.vo.FlowGroupRespVO;
 import cn.iocoder.yudao.server.controller.admin.vo.FlowGroupSaveReqVO;
+import cn.iocoder.yudao.server.controller.admin.vo.FlowRespVO;
+import cn.iocoder.yudao.server.dal.dataobject.FlowDO;
 import cn.iocoder.yudao.server.dal.dataobject.FlowGroupDO;
+import cn.iocoder.yudao.server.dal.mysql.FlowGroupMapper;
+import cn.iocoder.yudao.server.dal.mysql.FlowMapper;
 import cn.iocoder.yudao.server.service.FlowGroupService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -36,6 +43,10 @@ public class FlowGroupController {
 
     @Resource
     private FlowGroupService flowGroupService;
+    @Autowired
+    private FlowGroupMapper flowGroupMapper;
+    @Autowired
+    private FlowMapper flowMapper;
 
     @PostMapping("/create")
     @Operation(summary = "创建门户流程分组信息")
@@ -64,7 +75,8 @@ public class FlowGroupController {
     @GetMapping("/get")
     @Operation(summary = "获得门户流程分组信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('portal:flow-group:query')")
+//    @PreAuthorize("@ss.hasPermission('portal:flow-group:query')")
+    @PermitAll
     public CommonResult<FlowGroupRespVO> getFlowGroup(@RequestParam("id") Long id) {
         FlowGroupDO flowGroup = flowGroupService.getFlowGroup(id);
         return success(BeanUtils.toBean(flowGroup, FlowGroupRespVO.class));
@@ -91,4 +103,18 @@ public class FlowGroupController {
                         BeanUtils.toBean(list, FlowGroupRespVO.class));
     }
 
+    @GetMapping("/all")
+    @Operation(summary = "获得门户流程分组及子项信息")
+    @PreAuthorize("@ss.hasPermission('portal:flow-group:query')")
+    public CommonResult<List<FlowGroupRespVO>> getFlowGroupDetails(@Valid FlowGroupPageReqVO pageReqVO) {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<FlowGroupDO> list = flowGroupService.getFlowGroupPage(pageReqVO).getList();
+        List<FlowGroupRespVO> groups = BeanUtils.toBean(list, FlowGroupRespVO.class);
+        groups.forEach(item -> {
+            List<FlowDO> groupId = flowMapper.selectList("group_id", item.getId()).stream().filter(e -> e.getStatus()==0).collect(Collectors.toList());
+            List<FlowRespVO> bean = BeanUtils.toBean(groupId, FlowRespVO.class);
+            item.setFlowRespVOS(bean);
+        });
+        return success(groups);
+    }
 }

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/FlowGroupRespVO.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "管理后台 - 门户流程分组信息 Response VO")
 @Data
@@ -32,4 +33,5 @@ public class FlowGroupRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    private List<FlowRespVO> flowRespVOS;
 }

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/FlowRespVO.java

@@ -28,10 +28,19 @@ public class FlowRespVO {
     @ExcelProperty("流程跳转连接")
     private String flowUrl;
 
+    @Schema(description = "流程跳转首页")
+    private String indexUrl;
+
     @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("状态（0正常 1停用）")
     private Integer status;
 
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "图标")
+    private String icon;
+
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")
     private String remark;

yudao-server/src/main/java/cn/iocoder/yudao/server/controller/admin/vo/FlowSaveReqVO.java

@@ -14,7 +14,6 @@ public class FlowSaveReqVO {
     private Long id;
 
     @Schema(description = "流程分组id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "流程分组id不能为空")
     private Long groupId;
 
     @Schema(description = "分组子名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
@@ -24,9 +23,17 @@ public class FlowSaveReqVO {
     @Schema(description = "流程跳转连接", example = "https://www.iocoder.cn")
     private String flowUrl;
 
+    @Schema(description = "流程跳转首页")
+    private String indexUrl;
+
     @Schema(description = "状态（0正常 1停用）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态（0正常 1停用）不能为空")
     private Integer status;
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "图标")
+    private String icon;
 
     @Schema(description = "备注", example = "你说的对")
     private String remark;

yudao-server/src/main/java/cn/iocoder/yudao/server/dal/dataobject/FlowDO.java

@@ -30,16 +30,18 @@ public class FlowDO extends BaseDO {
      * 分组id
      */
     private Long groupId;
-    private String flowCode;
     private String flowName;
     /**
      * 流程跳转连接
      */
     private String flowUrl;
+    private String indexUrl;
+    private Integer sort;
     /**
      * 状态（0正常 1停用）
      */
     private Integer status;
+    private String icon;
     /**
      * 备注
      */

yudao-server/src/main/java/cn/iocoder/yudao/server/service/FlowGroupServiceImpl.java

@@ -30,6 +30,7 @@ public class FlowGroupServiceImpl implements FlowGroupService {
     public Long createFlowGroup(FlowGroupSaveReqVO createReqVO) {
         // 插入
         FlowGroupDO flowGroup = BeanUtils.toBean(createReqVO, FlowGroupDO.class);
+        flowGroup.setDeleted(false);
         flowGroupMapper.insert(flowGroup);
         // 返回
         return flowGroup.getId();

yudao-server/src/main/java/cn/iocoder/yudao/server/service/FlowServiceImpl.java

@@ -30,6 +30,8 @@ public class FlowServiceImpl implements FlowService {
     public Long createFlow(FlowSaveReqVO createReqVO) {
         // 插入
         FlowDO flow = BeanUtils.toBean(createReqVO, FlowDO.class);
+        flow.setDeleted(false);
+        flow.setStatus(0);
         flowMapper.insert(flow);
         // 返回
         return flow.getId();