From 89bd014f11f09cdb697504dd39b2218296013c24 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Thu, 6 Feb 2025 17:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C=E6=B5=81?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E4=BF=AE=E5=A4=8Ddept=E5=92=8Cuser?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3feign=E8=BF=9C=E7=A8=8B=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/service/impl/BoxesBookingServiceImpl.java | 1 - .../flow/engine/controller/EngineFlowController.java | 2 +- .../flow/engine/service/NodeTaskCompleteNotifyService.java | 2 +- .../com/bsd/pjcloud/flow/engine/service/packge-info.java | 2 +- .../flow/task/api/feign/RemoteFlowApiFlowService.java | 2 +- .../flow/task/api/feign/RemoteFlowEngineService.java | 2 +- .../pjcloud/flow/task/api/feign/RemoteFlowTaskService.java | 2 +- .../com/bsd/pjcloud/flow/task/api/feign/packge-info.java | 6 ------ .../com/bsd/pjcloud/flow/task/constant/packge-info.java | 2 +- .../java/com/bsd/pjcloud/flow/task/dto/packge-info.java | 2 +- .../java/com/bsd/pjcloud/flow/task/entity/packge-info.java | 2 +- .../bsd/pjcloud/flow/task/config/SequenceConfiguration.java | 2 +- .../bsd/pjcloud/flow/task/controller/ProcessController.java | 6 +++--- .../flow/task/controller/ProcessInstanceController.java | 2 +- .../com/bsd/pjcloud/flow/task/service/IProcessService.java | 2 -- .../flow/task/service/impl/ProcessCopyServiceImpl.java | 2 +- .../flow/task/service/impl/ProcessInstanceServiceImpl.java | 4 ++-- .../pjcloud/flow/task/service/impl/ProcessServiceImpl.java | 4 +--- .../bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java | 2 +- .../com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java | 1 + .../com/bsd/pjcloud/admin/api/feign/RemoteUserService.java | 2 ++ .../com/bsd/pjcloud/admin/controller/SysDeptController.java | 2 ++ .../com/bsd/pjcloud/admin/controller/SysUserController.java | 2 ++ .../wallet/service/impl/WalletStrideServiceImpl.java | 1 - .../java/com/bsd/pjcloud/wallet/utils/flow/FlowUtil.java | 3 --- 25 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java index 75ca310c0..bd0327dc8 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/BoxesBookingServiceImpl.java @@ -15,7 +15,6 @@ import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowApiFlowService; import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; diff --git a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/controller/EngineFlowController.java b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/controller/EngineFlowController.java index d653600ea..f74645b2d 100644 --- a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/controller/EngineFlowController.java +++ b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/controller/EngineFlowController.java @@ -9,12 +9,12 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.flow.task.entity.Process; import com.fasterxml.jackson.databind.ObjectMapper; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.flow.engine.utils.ModelUtil; import com.bsd.pjcloud.flow.task.dto.*; -import com.bsd.pjcloud.flow.task.entity.Process; import com.bsd.pjcloud.flow.task.utils.NodeUtil; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; diff --git a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/NodeTaskCompleteNotifyService.java b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/NodeTaskCompleteNotifyService.java index d881b6d33..ed4b47f46 100644 --- a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/NodeTaskCompleteNotifyService.java +++ b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/NodeTaskCompleteNotifyService.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; /** * 节点任务完成通知处理 * - * @author pjcloud + * @author lengleng * @date 2024/7/9 */ @Slf4j diff --git a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/packge-info.java b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/packge-info.java index 1f0eac5eb..b55465edf 100644 --- a/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/packge-info.java +++ b/pjcloud-flow/pjcloud-flow-engine/pjcloud-flow-engine-biz/src/main/java/com/bsd/pjcloud/flow/engine/service/packge-info.java @@ -1,4 +1,4 @@ /* - * @author pjcloud archetype + * @author pigx archetype */ package com.bsd.pjcloud.flow.engine.service; \ No newline at end of file diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java index a0f5845bc..458438043 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowApiFlowService.java @@ -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) diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowEngineService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowEngineService.java index 6970ed041..e5f2310d9 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowEngineService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowEngineService.java @@ -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) diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowTaskService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowTaskService.java index bc7d4bed6..8fcc5cbd4 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowTaskService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/RemoteFlowTaskService.java @@ -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) diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java deleted file mode 100644 index d57e94978..000000000 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - @author pjcloud archetype - *

- * feign client 存放目录，注意 @EnablePjcloudFeignClients 的扫描范围 - */ -package com.bsd.pjcloud.flow.task.api.feign; \ No newline at end of file diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/constant/packge-info.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/constant/packge-info.java index 9f194dd52..3dd7096e5 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/constant/packge-info.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/constant/packge-info.java @@ -1,5 +1,5 @@ /* - * @author pjcloud archetype + * @author pigx archetype *

* 常量和枚举定义 */ diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/packge-info.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/packge-info.java index 365c02b7a..61e31a1a4 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/packge-info.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/dto/packge-info.java @@ -1,5 +1,5 @@ /* - * @author pjcloud archetype + * @author pigx archetype *

* DTO 存放目录 */ diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/packge-info.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/packge-info.java index fc60d6969..ff4645ce3 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/packge-info.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/entity/packge-info.java @@ -1,5 +1,5 @@ /* - * @author pjcloud archetype + * @author pigx archetype *

* 实体 存放目录 */ diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/config/SequenceConfiguration.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/config/SequenceConfiguration.java index 4197ab231..79c52213b 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/config/SequenceConfiguration.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/config/SequenceConfiguration.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration; import javax.sql.DataSource; /** - * @author pjcloud + * @author lengleng * @date 2023-07-19 *

* 设置发号器生成规则 diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessController.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessController.java index 5af10488c..b01b0c033 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessController.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessController.java @@ -19,7 +19,7 @@ public class ProcessController { * @param flowId * @return */ - @GetMapping("/getDetail") + @GetMapping("getDetail") public R 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); diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java index 15d5d1563..33d69b272 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/controller/ProcessInstanceController.java @@ -26,7 +26,7 @@ public class ProcessInstanceController { * @return */ @SneakyThrows - @PostMapping("/startProcessInstance") + @PostMapping("startProcessInstance") public R startProcessInstance(@RequestBody ProcessInstanceParamDto processInstanceParamDto) { return processInstanceService.startProcessInstance(processInstanceParamDto); } diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessService.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessService.java index c597fd33f..f3862d4ff 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessService.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/IProcessService.java @@ -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; - /** *

* 服务类 diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessCopyServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessCopyServiceImpl.java index 9ffddead9..d21b16771 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessCopyServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessCopyServiceImpl.java @@ -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; diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java index c829c85e4..c2bcc0764 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessInstanceServiceImpl.java @@ -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; diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java index 21041c265..1b6e29933 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/ProcessServiceImpl.java @@ -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 impl return R.ok(); } - - } diff --git a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java index 778a43951..b0e03f9f3 100644 --- a/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java +++ b/pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-biz/src/main/java/com/bsd/pjcloud/flow/task/service/impl/TaskServiceImpl.java @@ -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; diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java index c1a44e43d..5353eab62 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java @@ -59,6 +59,7 @@ public interface RemoteDeptService { * @return 负责人ID列表 */ @GetMapping("/dept/leader/{deptId}") + @NoToken R> getAllDeptLeader(@PathVariable("deptId") Long deptId); /** diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java index 5295c5fda..1f5e4ec47 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java @@ -117,6 +117,7 @@ public interface RemoteUserService { * @return 用户ID列表 */ @GetMapping("/user/getUserIdListByRoleIdList") + @NoToken R> getUserIdListByRoleIdList(@RequestParam("roleIdList") List roleIdList); /** @@ -126,6 +127,7 @@ public interface RemoteUserService { * @return 用户ID列表 */ @GetMapping("/user/getUserIdListByDeptIdList") + @NoToken R> getUserIdListByDeptIdList(@RequestParam("deptIdList") List deptIdList); /** diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java index bf123e0d9..5e9454543 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java @@ -141,6 +141,8 @@ public class SysDeptController { return R.ok(sysDeptService.listDescendant(deptId)); } + + @Inner @GetMapping(value = "/leader/{deptId}") public R getAllDeptLeader(@PathVariable Long deptId) { return R.ok(sysDeptService.listDeptLeader(deptId)); diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index df43e0495..416ec8391 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -308,6 +308,7 @@ public class SysUserController { * @param roleIdList 角色ID列表 * @return R 返回结果对象，包含根据角色ID列表获取到的用户ID列表信息 */ + @Inner @GetMapping("/getUserIdListByRoleIdList") public R> getUserIdListByRoleIdList(Long[] roleIdList) { return R.ok(userService.listUserIdByRoleIds(CollUtil.toList(roleIdList))); @@ -319,6 +320,7 @@ public class SysUserController { * @param deptIdList 部门ID列表 * @return R 返回结果对象，包含根据部门ID列表获取到的用户ID列表信息 */ + @Inner @GetMapping("/getUserIdListByDeptIdList") public R> getUserIdListByDeptIdList(Long[] deptIdList) { return R.ok(userService.listUserIdByDeptIds(CollUtil.toList(deptIdList))); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java index f50a0fbcb..2d2121078 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java @@ -22,7 +22,6 @@ import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto; import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum; import com.bsd.pjcloud.wallet.api.dto.WalletStrideDto; import com.bsd.pjcloud.wallet.api.entity.WalletStrideEntity; -import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity; import com.bsd.pjcloud.wallet.api.vo.WalletStrideVo; import com.bsd.pjcloud.wallet.mapper.WalletStrideMapper; import com.bsd.pjcloud.wallet.service.WalletStrideService; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/FlowUtil.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/FlowUtil.java index bbb09a1e5..351a51b15 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/FlowUtil.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/utils/flow/FlowUtil.java @@ -14,9 +14,7 @@ import com.bsd.pjcloud.flow.task.constant.NodeUserTypeEnum; import com.bsd.pjcloud.flow.task.dto.ProcessInstanceParamDto; import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto; import com.bsd.pjcloud.flow.task.entity.Process; -import com.bsd.pjcloud.flow.task.vo.FormItemVO; import com.bsd.pjcloud.flow.task.vo.ProcessVO; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +22,6 @@ import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.Optional;