Bladeren bron

fix:恢复代码

韩帛霖 1 jaar geleden
bovenliggende
commit
1bfe72c33f

+ 58 - 0
ruoyi-common/src/main/java/com/ruoyi/common/config/bpm/BpmProperties.java

@@ -0,0 +1,58 @@
+package com.ruoyi.common.config.bpm;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author hmc
+ * @date 2023-11-02 18:07
+ * @Description:
+ */
+@Configuration
+public class BpmProperties {
+    //根据用户id查询当前用户所具备的角色key的ip地址 MAIN_ROLESKEY_IP
+    @Value("${parameter.ip.MAIN_ROLESKEY_IP}")
+    public String mainRolesKeyIp;
+
+    /** 根据scriptKey获取节点脚本详情地址 */
+    @Value("${parameter.ip.GET_NODESCRIPT_IP}")
+    public String getNodeScriptIp;
+
+    @Value("${parameter.ip.QUERY_USER_EXISTS_BY_ROLEKEY_IP}")
+    public String queryUserExistsByRoleKeyIp;
+
+    @Value("${parameter.ip.QUERY_USER_EXISTS_BY_USERIDS_IP}")
+    public String queryUserExistsByUserIdsIp;
+
+    public String getMainRolesKeyIp() {
+        return mainRolesKeyIp;
+    }
+
+    public void setMainRolesKeyIp(String mainRolesKeyIp) {
+        this.mainRolesKeyIp = mainRolesKeyIp;
+    }
+
+    public void setGetNodeScriptIp(String getNodeScriptIp) {
+        this.getNodeScriptIp = getNodeScriptIp;
+    }
+
+    public String getGetNodeScriptIp() {
+        return getNodeScriptIp;
+    }
+
+    public String getQueryUserExistsByRoleKeyIp() {
+        return queryUserExistsByRoleKeyIp;
+    }
+
+    public void setQueryUserExistsByRoleKeyIp(String queryUserExistsByRoleKeyIp) {
+        this.queryUserExistsByRoleKeyIp = queryUserExistsByRoleKeyIp;
+    }
+
+    public String getQueryUserExistsByUserIdsIp() {
+        return queryUserExistsByUserIdsIp;
+    }
+
+    public void setQueryUserExistsByUserIdsIp(String queryUserExistsByUserIdsIp) {
+        this.queryUserExistsByUserIdsIp = queryUserExistsByUserIdsIp;
+    }
+}

+ 1 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/controller/BpmExecuteProcessController.java

@@ -103,7 +103,7 @@ public class BpmExecuteProcessController extends BaseController {
     /**
      * 共通投产流程接口
      */
-    @Log(title = "投产执行流程", businessType = BusinessType.DELETE)
+    @Log(title = "投产执行流程", businessType = BusinessType.INSERT)
     @PostMapping("/productionScheduling")
     public AjaxResult productionScheduling(@RequestBody IntoProduction intoProduction) {
         return bpmExecuteProcessService.productionScheduling(intoProduction);

+ 7 - 0
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/dispersed/service/impl/BpmExecuteProcessServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.execution.produce.dispersed.service.impl;
 import java.util.*;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.execution.produce.dispersed.runbpm.PreExecutionToolClass;
 import com.ruoyi.execution.produce.dispersed.enetity.BpmExecuteProcess;
@@ -48,6 +49,12 @@ public class BpmExecuteProcessServiceImpl implements IBpmExecuteProcessService {
     public List<BpmExecuteProcess> selectBpmExecuteProcessList(BpmExecuteProcess bpmExecuteProcess) {
         // 根据当前的用户id得到可以执行的流程节点
         SecurityUtils.getUserId();
+        // 得到当前发起请求的用户角色列表
+        List<SysRole> sysRoles = SecurityUtils.getLoginUser().getUser().getRoles();
+
+
+        // 首先根据当前登陆用户得到他可以执行的所有节点
+
 
 
         return runBpmExecuteProcessMapper.selectBpmExecuteProcessList(bpmExecuteProcess);