zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新工作流模块，修复dept和user接口feign远程调用问题

Browse Source
This commit is contained in:
zjf committed 2025-02-06 17:14:38 +08:00
1 parent db7359b046
commit 89bd014f11
25 files changed
+26 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @author pjcloud
* @author lengleng
* @date 2023/7/14
*/
@FeignClient(contextId = "remoteAiFlowService", value = ServiceNameConstants.FLOW_TASK_SERVER)
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowEngineService.java
+1 -1
View File
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.Map;
/**
* @author pjcloud
* @author lengleng
* @date 2023/7/14
*/
@FeignClient(contextId = "remoteFlowEngineService", value = ServiceNameConstants.FLOW_ENGINE_SERVER)
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowTaskService.java
+1 -1
View File
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/**
* @author pjcloud
* @author lengleng
* @date 2023/7/14
*/
@FeignClient(contextId = "remoteFlowTaskService", value = ServiceNameConstants.FLOW_TASK_SERVER)
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java
-6
View File
@@ -1,6 +0,0 @@
/*
@author pjcloud archetype
* <p>
* feign client 存放目录，注意 @EnablePjcloudFeignClients 的扫描范围
*/
package com.bsd.pjcloud.flow.task.api.feign;
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/constant/packge-info.java
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* @author pjcloud archetype
* @author pigx archetype
* <p>
* 常量和枚举定义
*/
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/packge-info.java
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* @author pjcloud archetype
* @author pigx archetype
* <p>
* DTO 存放目录
*/
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/packge-info.java
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* @author pjcloud archetype
* @author pigx archetype
* <p>
* 实体 存放目录
*/
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/config/SequenceConfiguration.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
import javax.sql.DataSource;
/**
* @author pjcloud
* @author lengleng
* @date 2023-07-19
* <p>
* 设置发号器生成规则
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessController.java
+3 -3
View File
@@ -19,7 +19,7 @@ public class ProcessController {
* @param flowId
* @return
*/
@GetMapping("/getDetail")
@GetMapping("getDetail")
public R<ProcessVO> getDetail(String flowId) {
return processService.getDetail(flowId);
}
@@ -29,7 +29,7 @@ public class ProcessController {
* @param process
* @return
*/
@PostMapping("/create")
@PostMapping("create")
public R create(@RequestBody Process process) {
return processService.create(process);
}
@@ -40,7 +40,7 @@ public class ProcessController {
* @param type 类型 stop using delete
* @return 操作结果
*/
@PutMapping("/update/{flowId}")
@PutMapping("update/{flowId}")
public R update(@PathVariable String flowId, @RequestParam String type,
@RequestParam(required = false) Long groupId) {
return processService.update(flowId, type, groupId);
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java
+1 -1
View File
@@ -26,7 +26,7 @@ public class ProcessInstanceController {
* @return
*/
@SneakyThrows
@PostMapping("/startProcessInstance")
@PostMapping("startProcessInstance")
public R startProcessInstance(@RequestBody ProcessInstanceParamDto processInstanceParamDto) {
return processInstanceService.startProcessInstance(processInstanceParamDto);
}
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessService.java
-2
View File
@@ -5,8 +5,6 @@ import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.flow.task.vo.ProcessVO;
import java.util.List;
/**
* <p>
* 服务类
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessCopyServiceImpl.java
+1 -1
View File
@@ -5,13 +5,13 @@ import cn.hutool.core.lang.Dict;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.flow.task.constant.FormTypeEnum;
import com.bsd.pjcloud.flow.task.constant.ProcessInstanceConstant;
import com.bsd.pjcloud.flow.task.dto.Node;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.flow.task.entity.ProcessCopy;
import com.bsd.pjcloud.flow.task.mapper.ProcessCopyMapper;
import com.bsd.pjcloud.flow.task.service.IProcessCopyService;
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java
+2 -2
View File
@@ -8,12 +8,13 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.security.service.PjcloudUser;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.bsd.pjcloud.admin.api.entity.SysUser;
import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.security.service.PjcloudUser;
import com.bsd.pjcloud.common.security.util.SecurityUtils;
import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowEngineService;
import com.bsd.pjcloud.flow.task.constant.FormTypeEnum;
@@ -21,7 +22,6 @@ import com.bsd.pjcloud.flow.task.constant.NodeStatusEnum;
import com.bsd.pjcloud.flow.task.constant.NodeUserTypeEnum;
import com.bsd.pjcloud.flow.task.constant.ProcessInstanceConstant;
import com.bsd.pjcloud.flow.task.dto.*;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.flow.task.entity.*;
import com.bsd.pjcloud.flow.task.service.*;
import com.bsd.pjcloud.flow.task.utils.NodeFormatUtil;
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java
+1 -3
View File
@@ -7,6 +7,7 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.bsd.pjcloud.common.core.util.R;
@@ -17,7 +18,6 @@ import com.bsd.pjcloud.flow.task.constant.FormTypeEnum;
import com.bsd.pjcloud.flow.task.constant.ProcessInstanceConstant;
import com.bsd.pjcloud.flow.task.dto.Node;
import com.bsd.pjcloud.flow.task.dto.NodeUser;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.flow.task.entity.ProcessStarter;
import com.bsd.pjcloud.flow.task.mapper.ProcessMapper;
import com.bsd.pjcloud.flow.task.service.IProcessService;
@@ -259,6 +259,4 @@ public class ProcessServiceImpl extends ServiceImpl<ProcessMapper, Process> impl
return R.ok();
}
}
pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java
+1 -1
View File
@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Dict;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.bsd.pjcloud.common.core.util.R;
@@ -18,7 +19,6 @@ import com.bsd.pjcloud.flow.task.dto.IndexPageStatistics;
import com.bsd.pjcloud.flow.task.dto.Node;
import com.bsd.pjcloud.flow.task.dto.TaskParamDto;
import com.bsd.pjcloud.flow.task.dto.TaskResultDto;
import com.bsd.pjcloud.flow.task.entity.Process;
import com.bsd.pjcloud.flow.task.entity.ProcessCopy;
import com.bsd.pjcloud.flow.task.entity.ProcessInstanceRecord;
import com.bsd.pjcloud.flow.task.entity.ProcessNodeRecordAssignUser;