Explorar o código

update 补充工作流动态启用注解

AprilWind hai 1 ano
pai
achega
6c2518640b

+ 2 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
 import org.dromara.workflow.domain.vo.FlowSpelVo;
 import org.dromara.workflow.domain.vo.FlowSpelVo;
 import org.dromara.workflow.service.IFlwSpelService;
 import org.dromara.workflow.service.IFlwSpelService;
@@ -28,6 +29,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
  * @author Michelle.Chung
  * @author Michelle.Chung
  * @date 2025-07-04
  * @date 2025-07-04
  */
  */
+@ConditionalOnEnable
 @Validated
 @Validated
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @RestController
 @RestController

+ 2 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java

@@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.service.DeptService;
 import org.dromara.common.core.service.DeptService;
+import org.dromara.workflow.common.ConditionalOnEnable;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 /**
 /**
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Component;
  *
  *
  * @author Michelle.Chung
  * @author Michelle.Chung
  */
  */
+@ConditionalOnEnable
 @Slf4j
 @Slf4j
 @Component
 @Component
 @RequiredArgsConstructor
 @RequiredArgsConstructor

+ 2 - 0
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.FlowSpel;
 import org.dromara.workflow.domain.FlowSpel;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
 import org.dromara.workflow.domain.vo.FlowSpelVo;
 import org.dromara.workflow.domain.vo.FlowSpelVo;
@@ -29,6 +30,7 @@ import java.util.Map;
  * @author Michelle.Chung
  * @author Michelle.Chung
  * @date 2025-07-04
  * @date 2025-07-04
  */
  */
+@ConditionalOnEnable
 @Slf4j
 @Slf4j
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Service
 @Service