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

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;
 

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;

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

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;

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)

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)

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)

pjcloud-flow/pjcloud-flow-task/pjcloud-flow-task-api/src/main/java/com/bsd/pjcloud/flow/task/api/feign/packge-info.java

@@ -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,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,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,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;

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<List<Long>> getAllDeptLeader(@PathVariable("deptId") Long deptId);
 
     /**

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<List<Long>> getUserIdListByRoleIdList(@RequestParam("roleIdList") List<Long> roleIdList);
 
     /**
@@ -126,6 +127,7 @@ public interface RemoteUserService {
      * @return 用户ID列表
      */
     @GetMapping("/user/getUserIdListByDeptIdList")
+    @NoToken
     R<List<SysUser>> getUserIdListByDeptIdList(@RequestParam("deptIdList") List<Long> deptIdList);
 
     /**

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));

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<List<Long>> 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<List<SysUser>> getUserIdListByDeptIdList(Long[] deptIdList) {
         return R.ok(userService.listUserIdByDeptIds(CollUtil.toList(deptIdList)));

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;

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;