소스 검색

feat:校验脚本是否存在容器当中,优化工具接口

韩帛霖 1 년 전
부모
커밋
d1f8004e22

+ 1 - 3
ruoyi-common/src/main/java/com/ruoyi/common/config/Bpm/BpmProperties.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.config.bpm;
 
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -9,10 +8,9 @@ import org.springframework.context.annotation.Configuration;
  * @date 2023-11-02 18:07
  * @Description:
  */
-@Data
 @Configuration
 public class BpmProperties {
     //根据用户id查询当前用户所具备的角色key的ip地址 MAIN_ROLESKEY_IP
     @Value("${parameter.ip.MAIN_ROLESKEY_IP}")
-    private  String mainRolesKeyIp;
+    public static final String mainRolesKeyIp = "";
 }

+ 12 - 3
ruoyi-common/src/main/java/com/ruoyi/common/utils/bpm/BpmUtils.java

@@ -1,5 +1,9 @@
 package com.ruoyi.common.utils.bpm;
+
 import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.config.bpm.BpmProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -7,19 +11,24 @@ import org.springframework.web.client.RestTemplate;
  * @date 2023-11-02 15:29
  * @Description:
  */
+@Component
 public class BpmUtils {
 
+    @Autowired
+    private BpmProperties bpmProperties;
+
     /**
      * 根据用户查询角色key
+     *
      * @param userId
      * @return
      */
-    public static String[]  getRoleKeyByUserId(String ip,Long userId){
+    public String[] getRoleKeyByUserId(Long userId) {
         RestTemplate restTemplate = new RestTemplate();
-        String ret = restTemplate.getForObject(ip+userId,String.class);
+        String ret = restTemplate.getForObject(bpmProperties.mainRolesKeyIp + userId, String.class);
         JSONObject jsonObject = JSONObject.parseObject(ret);
         String s = (String) jsonObject.get("rolesKey");
         String[] strings = JSONObject.parseObject(s, String[].class);
-        return  strings;
+        return strings;
     }
 }

+ 16 - 1
ruoyi-process-execution/src/main/java/com/ruoyi/execution/produce/RunImplementationClass.java

@@ -60,7 +60,7 @@ public class RunImplementationClass<J> {
      * @param implementationName 实现类名称
      * @return
      */
-    public Boolean RunScriptImplementationClassLogicCode(String implementationName, J parameter) {
+    public boolean RunScriptImplementationClassLogicCode(String implementationName, J parameter) {
         if (applicationContext.containsBean(implementationName)) {
             IScriptService iScriptService = (IScriptService) applicationContext.getBean(implementationName, IScriptService.class);
             // 校验当前需要执行的脚本是否存在
@@ -81,4 +81,19 @@ public class RunImplementationClass<J> {
         }
     }
 
+    /**
+     * 根据脚本名称校验脚本是否存在
+     *
+     * @param implementationName 脚本名称
+     * @return
+     */
+    public boolean isVerificationMethod(String implementationName) {
+        if (applicationContext.containsBean(implementationName)) {
+            IScriptService iScriptService = (IScriptService) applicationContext.getBean(implementationName, IScriptService.class);
+            // 校验当前需要执行的脚本是否存在
+            return iScriptService.isVerificationMethod();
+        } else {
+            return false;
+        }
+    }
 }