From e16ed8a86fd1e4048b3de7d9646ceaada170d199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8A=8B=E9=81=93=E6=BA=90=E7=A0=81?= Date: Sat, 26 Apr 2025 03:19:36 +0000 Subject: [PATCH 01/80] =?UTF-8?q?!1307=20=E3=80=90fix=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=A4=9A=E5=AE=9E=E4=BE=8B=E4=BD=BF=E7=94=A8=20Linked?= =?UTF-8?q?HashSet=20=E4=BF=9D=E6=8C=81=E9=A1=BA=E5=BA=8F=20Merge=20pull?= =?UTF-8?q?=20request=20!1307=20from=20aho/feature/bpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 311488fa6c96f4d47f7f2a64f5518247d69a674b Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Fri, 29 Aug 2025 15:18:49 +0800 Subject: [PATCH 02/80] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../definition/vo/model/BpmModelMetaInfoVO.java | 17 +++++++++++++++++ .../definition/BpmProcessDefinitionInfoDO.java | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java index 943a82d546..5284281f10 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java @@ -100,6 +100,10 @@ public class BpmModelMetaInfoVO { @Schema(description = "任务后置通知设置", example = "{}") private HttpRequestSetting taskAfterTriggerSetting; + @Schema(description = "自定义打印模板设置", example = "{}") + @Valid + private PrintTemplateSetting printTemplateSetting; + @Schema(description = "流程 ID 规则") @Data @Valid @@ -180,4 +184,17 @@ public class BpmModelMetaInfoVO { } + @Schema(description = "自定义打印模板设置") + @Data + public static class PrintTemplateSetting { + + @Schema(description = "是否自定义打印模板", example = "false") + @NotNull(message = "是否自定义打印模板不能为空") + private Boolean enable; + + @Schema(description = "打印模板", example = "

") + private String template; + + } + } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java index 37e2c4462d..6fd905ee3d 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java @@ -224,4 +224,10 @@ public class BpmProcessDefinitionInfoDO extends BaseDO { @TableField(typeHandler = JacksonTypeHandler.class) private BpmModelMetaInfoVO.HttpRequestSetting taskAfterTriggerSetting; + /** + * 自定义打印模板设置 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private BpmModelMetaInfoVO.PrintTemplateSetting printTemplateSetting; + } From 543d7275b08f8ad7bc1f5eb1c0b64b658bf002a7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 31 Aug 2025 16:05:03 +0800 Subject: [PATCH 03/80] =?UTF-8?q?fix=EF=BC=9A=E3=80=90ai=20=E5=A4=A7?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E3=80=91=E5=85=BC=E5=AE=B9=20mcp=20server=20?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/config/SecurityConfiguration.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java index bd13a2c146..6ca5934b62 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java @@ -8,6 +8,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer; +import java.util.Optional; + /** * AI 模块的 Security 配置 */ @@ -15,7 +17,7 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH public class SecurityConfiguration { @Resource - private McpServerProperties serverProperties; + private Optional serverProperties; @Bean("aiAuthorizeRequestsCustomizer") public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { @@ -24,8 +26,10 @@ public class SecurityConfiguration { @Override public void customize(AuthorizeHttpRequestsConfigurer.AuthorizationManagerRequestMatcherRegistry registry) { // MCP Server - registry.requestMatchers(serverProperties.getSseEndpoint()).permitAll(); - registry.requestMatchers(serverProperties.getSseMessageEndpoint()).permitAll(); + serverProperties.ifPresent(properties -> { + registry.requestMatchers(properties.getSseEndpoint()).permitAll(); + registry.requestMatchers(properties.getSseMessageEndpoint()).permitAll(); + }); } }; From 906ed512ff1741fc59e34237a53f8de396d515af Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 1 Sep 2025 13:13:46 +0800 Subject: [PATCH 04/80] =?UTF-8?q?chore:=20mybatis-plus=20from=203.5.12=20t?= =?UTF-8?q?o=203.5.14=20fix=EF=BC=9ABaseDO=20=E7=A7=BB=E9=99=A4=20jdbcType?= =?UTF-8?q?=20=3D=20JdbcType.VARCHAR=20=E9=81=BF=E5=85=8D=E8=A2=AB?= =?UTF-8?q?=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-dependencies/pom.xml | 2 +- .../yudao/framework/mybatis/core/dataobject/BaseDO.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 8d8ea44dcc..cc696f271c 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -24,7 +24,7 @@ 1.2.27 3.5.19 - 3.5.12 + 3.5.14 1.5.4 4.3.1 3.0.6 diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java index 7e07fd8e32..a79fb2a73c 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fhs.core.trans.vo.TransPojo; import lombok.Data; -import org.apache.ibatis.type.JdbcType; import java.io.Serializable; import java.time.LocalDateTime; @@ -38,14 +37,14 @@ public abstract class BaseDO implements Serializable, TransPojo { * * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 */ - @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR) + @TableField(fill = FieldFill.INSERT) private String creator; /** * 更新者，目前使用 SysUser 的 id 编号 * * 使用 String 类型的原因是，未来可能会存在非数值的情况，留好拓展性。 */ - @TableField(fill = FieldFill.INSERT_UPDATE, jdbcType = JdbcType.VARCHAR) + @TableField(fill = FieldFill.INSERT_UPDATE) private String updater; /** * 是否删除 From 796d69b241a229510a0ecf39d6085c085855e5c3 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 1 Sep 2025 15:17:06 +0800 Subject: [PATCH 05/80] =?UTF-8?q?refactor:=20=E3=80=90IoT=20=E7=89=A9?= =?UTF-8?q?=E8=81=94=E7=BD=91=E3=80=91test=20BaseMockitoUnitTest=20?= =?UTF-8?q?=E2=86=92=20BaseMatcherTest=EF=BC=8C=E6=94=AF=E6=8C=81=20Spring?= =?UTF-8?q?=20=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../matcher/IotSceneRuleMatcherHelper.java | 2 +- .../rule/scene/matcher/BaseMatcherTest.java | 32 +++++++++++++++++++ .../CurrentTimeConditionMatcherTest.java | 12 ++++--- .../DevicePropertyConditionMatcherTest.java | 12 ++++--- .../DeviceStateConditionMatcherTest.java | 12 ++++--- .../DeviceEventPostTriggerMatcherTest.java | 12 ++++--- .../DevicePropertyPostTriggerMatcherTest.java | 12 ++++--- ...DeviceServiceInvokeTriggerMatcherTest.java | 12 ++++--- .../DeviceStateUpdateTriggerMatcherTest.java | 24 +++++++++++--- .../trigger/TimerTriggerMatcherTest.java | 12 ++++--- 10 files changed, 109 insertions(+), 33 deletions(-) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java index 7175e37a7e..db111e4472 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java @@ -91,7 +91,7 @@ public final class IotSceneRuleMatcherHelper { Map springExpressionVariables = new HashMap<>(); // 设置源值 - springExpressionVariables.put(IotSceneRuleConditionOperatorEnum.SPRING_EXPRESSION_SOURCE, sourceValue); + springExpressionVariables.put(IotSceneRuleConditionOperatorEnum.SPRING_EXPRESSION_SOURCE, StrUtil.toString(sourceValue)); // 处理参数值 if (StrUtil.isNotBlank(paramValue)) { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java new file mode 100644 index 0000000000..d73c926efa --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java @@ -0,0 +1,32 @@ +package cn.iocoder.yudao.module.iot.service.rule.scene.matcher; + +import cn.hutool.extra.spring.SpringUtil; +import cn.iocoder.yudao.framework.common.util.spring.SpringExpressionUtils; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +/** + * Matcher 测试基类 + * 提供通用的 Spring 测试配置 + * + * @author HUIHUI + */ +@SpringJUnitConfig +public abstract class BaseMatcherTest { + + /** + * 注入一下 SpringUtil，解析 EL 表达式时需要 + * {@link SpringExpressionUtils#parseExpression} + */ + @Configuration + static class TestConfig { + + @Bean + public SpringUtil springUtil() { + return new SpringUtil(); + } + + } + +} diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcherTest.java index 4b4bdfd029..f14da99a56 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcherTest.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -20,11 +20,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class CurrentTimeConditionMatcherTest extends BaseMockitoUnitTest { +public class CurrentTimeConditionMatcherTest extends BaseMatcherTest { - @InjectMocks private CurrentTimeConditionMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new CurrentTimeConditionMatcher(); + } + @Test public void testGetSupportedConditionType() { // 调用 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java index c4edf34361..9c34d86216 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import java.util.HashMap; import java.util.Map; @@ -21,11 +21,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DevicePropertyConditionMatcherTest extends BaseMockitoUnitTest { +public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { - @InjectMocks private DevicePropertyConditionMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DevicePropertyConditionMatcher(); + } + @Test public void testGetSupportedConditionType() { // 调用 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcherTest.java index 25ea571528..d54575ba41 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcherTest.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; @@ -18,11 +18,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DeviceStateConditionMatcherTest extends BaseMockitoUnitTest { +public class DeviceStateConditionMatcherTest extends BaseMatcherTest { - @InjectMocks private DeviceStateConditionMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DeviceStateConditionMatcher(); + } + @Test public void testGetSupportedConditionType() { // 调用 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcherTest.java index 1ed8f1c48f..4569d439cc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcherTest.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import java.util.HashMap; import java.util.Map; @@ -22,11 +22,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DeviceEventPostTriggerMatcherTest extends BaseMockitoUnitTest { +public class DeviceEventPostTriggerMatcherTest extends BaseMatcherTest { - @InjectMocks private DeviceEventPostTriggerMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DeviceEventPostTriggerMatcher(); + } + @Test public void testGetSupportedTriggerType_success() { // 准备参数 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcherTest.java index 2bed7fa631..eb191eb927 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcherTest.java @@ -1,14 +1,14 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import java.util.HashMap; import java.util.Map; @@ -24,11 +24,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DevicePropertyPostTriggerMatcherTest extends BaseMockitoUnitTest { +public class DevicePropertyPostTriggerMatcherTest extends BaseMatcherTest { - @InjectMocks private DevicePropertyPostTriggerMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DevicePropertyPostTriggerMatcher(); + } + @Test public void testGetSupportedTriggerType_success() { // 准备参数 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcherTest.java index a9348456f4..cfa36605f8 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcherTest.java @@ -1,13 +1,13 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; import cn.hutool.core.map.MapUtil; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import java.util.HashMap; import java.util.Map; @@ -22,11 +22,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DeviceServiceInvokeTriggerMatcherTest extends BaseMockitoUnitTest { +public class DeviceServiceInvokeTriggerMatcherTest extends BaseMatcherTest { - @InjectMocks private DeviceServiceInvokeTriggerMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DeviceServiceInvokeTriggerMatcher(); + } + @Test public void testGetSupportedTriggerType_success() { // 准备参数 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcherTest.java index b1e095ea3b..bee6e072e4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcherTest.java @@ -1,14 +1,17 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; +import cn.hutool.extra.spring.SpringUtil; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceStateEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static org.junit.jupiter.api.Assertions.*; @@ -18,11 +21,24 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class DeviceStateUpdateTriggerMatcherTest extends BaseMockitoUnitTest { +@SpringJUnitConfig(DeviceStateUpdateTriggerMatcherTest.TestConfig.class) +public class DeviceStateUpdateTriggerMatcherTest { + + @Configuration + static class TestConfig { + @Bean + public SpringUtil springUtil() { + return new SpringUtil(); + } + } - @InjectMocks private DeviceStateUpdateTriggerMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new DeviceStateUpdateTriggerMatcher(); + } + @Test public void testGetSupportedTriggerType_success() { // 准备参数 diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcherTest.java index 52ed5ec3de..f332f3097b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcherTest.java @@ -1,11 +1,11 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.BaseMatcherTest; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; @@ -16,11 +16,15 @@ import static org.junit.jupiter.api.Assertions.*; * * @author HUIHUI */ -public class TimerTriggerMatcherTest extends BaseMockitoUnitTest { +public class TimerTriggerMatcherTest extends BaseMatcherTest { - @InjectMocks private TimerTriggerMatcher matcher; + @BeforeEach + public void setUp() { + matcher = new TimerTriggerMatcher(); + } + @Test public void testGetSupportedTriggerType_success() { // 准备参数 From fe0c1bbf34a3bdc0ed2d3628abdac4b93c23b80f Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 1 Sep 2025 16:26:51 +0800 Subject: [PATCH 06/80] =?UTF-8?q?refactor:=20=E3=80=90IoT=20=E7=89=A9?= =?UTF-8?q?=E8=81=94=E7=BD=91=E3=80=91=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=9D=A1=E4=BB=B6=E5=8C=B9=E9=85=8D=E5=99=A8?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=97=AE=E9=A2=98=E5=B9=B6=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=80=BC=E6=8F=90=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevicePropertyConditionMatcher.java | 8 +- .../DeviceStateConditionMatcher.java | 6 +- .../DevicePropertyPostTriggerMatcher.java | 6 +- .../DeviceStateUpdateTriggerMatcher.java | 12 +- .../DevicePropertyConditionMatcherTest.java | 274 +++++++++++------- .../iot/core/util/IotDeviceMessageUtils.java | 77 +++++ .../core/util/IotDeviceMessageUtilsTest.java | 141 +++++++++ 7 files changed, 406 insertions(+), 118 deletions(-) create mode 100644 yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java index 4a8a8ab6f5..d3120a81bc 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; + import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; @@ -7,6 +8,7 @@ import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; import org.springframework.stereotype.Component; + /** * 设备属性条件匹配器 *

@@ -43,10 +45,10 @@ public class DevicePropertyConditionMatcher implements IotSceneRuleConditionMatc return false; } - // 2.1. 获取属性值 - Object propertyValue = message.getParams(); + // 2.1. 获取属性值 - 使用工具类方法正确提取属性值 + Object propertyValue = IotDeviceMessageUtils.extractPropertyValue(message, condition.getIdentifier()); if (propertyValue == null) { - IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "消息中属性值为空"); + IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "消息中属性值为空或未找到指定属性"); return false; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java index d5bb97a53e..99000fd06b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; +import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; @@ -35,8 +36,9 @@ public class DeviceStateConditionMatcher implements IotSceneRuleConditionMatcher return false; } - // 2.1 获取设备状态值 - Object stateValue = message.getParams(); + // 2.1 获取设备状态值 - 使用工具类方法正确提取状态值 + // 对于设备状态条件，状态值通过 getIdentifier 获取（实际是从 params.state 字段） + String stateValue = IotDeviceMessageUtils.getIdentifier(message); if (stateValue == null) { IotSceneRuleMatcherHelper.logConditionMatchFailure(message, condition, "消息中设备状态值为空"); return false; diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java index 6eccdab427..0ee31a951e 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java @@ -52,10 +52,10 @@ public class DevicePropertyPostTriggerMatcher implements IotSceneRuleTriggerMatc return false; } - // 2.1 获取属性值 - Object propertyValue = message.getParams(); + // 2.1 获取属性值 - 使用工具类方法正确提取属性值 + Object propertyValue = IotDeviceMessageUtils.extractPropertyValue(message, trigger.getIdentifier()); if (propertyValue == null) { - IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中属性值为空"); + IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中属性值为空或未找到指定属性"); return false; } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java index edd3c4e907..f3a9f44cb0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger; import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; +import cn.iocoder.yudao.module.iot.core.util.IotDeviceMessageUtils; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherHelper; @@ -43,16 +44,17 @@ public class DeviceStateUpdateTriggerMatcher implements IotSceneRuleTriggerMatch return false; } - // 2.1 获取设备状态值 - Object stateValue = message.getParams(); - if (stateValue == null) { + // 2.1 获取设备状态值 - 使用工具类方法正确提取状态值 + // 对于状态更新消息，状态值通过 getIdentifier 获取（实际是从 params.state 字段） + String stateIdentifier = IotDeviceMessageUtils.getIdentifier(message); + if (stateIdentifier == null) { IotSceneRuleMatcherHelper.logTriggerMatchFailure(message, trigger, "消息中设备状态值为空"); return false; } // 2.2 使用条件评估器进行匹配 - // TODO @puhui999: 状态匹配重新实现 - boolean matched = IotSceneRuleMatcherHelper.evaluateCondition(stateValue, trigger.getOperator(), trigger.getValue()); + // 状态值通常是字符串或数字，直接使用标识符作为状态值 + boolean matched = IotSceneRuleMatcherHelper.evaluateCondition(stateIdentifier, trigger.getOperator(), trigger.getValue()); if (matched) { IotSceneRuleMatcherHelper.logTriggerMatchSuccess(message, trigger); } else { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java index 9c34d86216..ddfebc66be 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcherTest.java @@ -1,6 +1,5 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition; -import cn.hutool.core.map.MapUtil; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionOperatorEnum; @@ -13,7 +12,6 @@ import java.util.HashMap; import java.util.Map; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString; import static org.junit.jupiter.api.Assertions.*; /** @@ -45,27 +43,17 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { int result = matcher.getPriority(); // 断言 - assertEquals(20, result); - } - - @Test - public void testIsEnabled() { - // 调用 - boolean result = matcher.isEnabled(); - - // 断言 - assertTrue(result); + assertEquals(25, result); // 修正：实际返回值是 25 } @Test public void testMatches_temperatureEquals_success() { - // 准备参数 - String propertyName = "temperature"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "temperature"; Double propertyValue = 25.5; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), String.valueOf(propertyValue) ); @@ -79,14 +67,13 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_humidityGreaterThan_success() { - // 准备参数 - String propertyName = "humidity"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "humidity"; Integer propertyValue = 75; Integer compareValue = 70; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), String.valueOf(compareValue) ); @@ -100,14 +87,13 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_pressureLessThan_success() { - // 准备参数 - String propertyName = "pressure"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "pressure"; Double propertyValue = 1010.5; Integer compareValue = 1020; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.LESS_THAN.getOperator(), String.valueOf(compareValue) ); @@ -121,14 +107,13 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_statusNotEquals_success() { - // 准备参数 - String propertyName = "status"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "status"; String propertyValue = "active"; String compareValue = "inactive"; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.NOT_EQUALS.getOperator(), compareValue ); @@ -142,14 +127,13 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_propertyMismatch_fail() { - // 准备参数 - String propertyName = "temperature"; + // 准备参数：创建属性上报消息，值不满足条件 + String propertyIdentifier = "temperature"; Double propertyValue = 15.0; Integer compareValue = 20; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), String.valueOf(compareValue) ); @@ -162,14 +146,16 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { } @Test - public void testMatches_propertyNotFound_fail() { - // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + public void testMatches_identifierMismatch_fail() { + // 准备参数：标识符不匹配 + String messageIdentifier = "temperature"; + String conditionIdentifier = "humidity"; + Double propertyValue = 25.5; + IotDeviceMessage message = createPropertyPostMessage(messageIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - randomString(), // 随机不存在的属性名 - IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), - "50" + conditionIdentifier, + IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), + String.valueOf(propertyValue) ); // 调用 @@ -182,8 +168,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_nullCondition_fail() { // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage("temperature", 25.5); // 调用 boolean result = matcher.matches(message, null); @@ -195,8 +180,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_nullConditionType_fail() { // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage("temperature", 25.5); IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); condition.setType(null); @@ -210,8 +194,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_missingIdentifier_fail() { // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage("temperature", 25.5); IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); condition.setType(IotSceneRuleConditionTypeEnum.DEVICE_PROPERTY.getType()); condition.setIdentifier(null); // 缺少标识符 @@ -228,8 +211,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_missingOperator_fail() { // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage("temperature", 25.5); IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); condition.setType(IotSceneRuleConditionTypeEnum.DEVICE_PROPERTY.getType()); condition.setIdentifier("temperature"); @@ -246,8 +228,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_missingParam_fail() { // 准备参数 - Map properties = MapUtil.of("temperature", 25.5); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage("temperature", 25.5); IotSceneRuleDO.TriggerCondition condition = new IotSceneRuleDO.TriggerCondition(); condition.setType(IotSceneRuleConditionTypeEnum.DEVICE_PROPERTY.getType()); condition.setIdentifier("temperature"); @@ -279,7 +260,7 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_nullDeviceProperties_fail() { - // 准备参数 + // 准备参数：消息的 params 为 null IotDeviceMessage message = new IotDeviceMessage(); message.setParams(null); IotSceneRuleDO.TriggerCondition condition = createValidCondition( @@ -296,14 +277,79 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { } @Test - public void testMatches_voltageGreaterThanOrEquals_success() { - // 准备参数 - String propertyName = "voltage"; - Double propertyValue = 12.0; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + public void testMatches_propertiesStructure_success() { + // 测试使用 properties 结构的消息（真实的属性上报场景） + String identifier = "temperature"; + Double propertyValue = 25.5; + IotDeviceMessage message = createPropertyPostMessageWithProperties(identifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + identifier, + IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), + "20" + ); + + // 调用 + boolean result = matcher.matches(message, condition); + + // 断言：修复后的实现应该能正确从 properties 中提取属性值 + assertTrue(result); + } + + @Test + public void testMatches_simpleValueMessage_success() { + // 测试简单值消息（params 直接是属性值） + Double propertyValue = 25.5; + IotDeviceMessage message = createSimpleValueMessage(propertyValue); + IotSceneRuleDO.TriggerCondition condition = createValidCondition( + "any", // 对于简单值消息，标识符匹配会被跳过 + IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), + "20" + ); + + // 调用 + boolean result = matcher.matches(message, condition); + + // 断言：修复后的实现应该能处理简单值消息 + // 但由于标识符匹配失败，结果为 false + assertFalse(result); + } + + @Test + public void testMatches_valueFieldStructure_success() { + // 测试使用 value 字段的消息结构 + String identifier = "temperature"; + Double propertyValue = 25.5; + + IotDeviceMessage message = new IotDeviceMessage(); + message.setDeviceId(randomLongId()); + message.setMethod("thing.event.post"); + + Map params = new HashMap<>(); + params.put("identifier", identifier); + params.put("value", propertyValue); + message.setParams(params); + + IotSceneRuleDO.TriggerCondition condition = createValidCondition( + identifier, + IotSceneRuleConditionOperatorEnum.GREATER_THAN.getOperator(), + "20" + ); + + // 调用 + boolean result = matcher.matches(message, condition); + + // 断言：修复后的实现应该能从 value 字段提取属性值 + assertTrue(result); + } + + @Test + public void testMatches_voltageGreaterThanOrEquals_success() { + // 准备参数：创建属性上报消息 + String propertyIdentifier = "voltage"; + Double propertyValue = 12.0; + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); + IotSceneRuleDO.TriggerCondition condition = createValidCondition( + propertyIdentifier, IotSceneRuleConditionOperatorEnum.GREATER_THAN_OR_EQUALS.getOperator(), String.valueOf(propertyValue) ); @@ -317,14 +363,13 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_currentLessThanOrEquals_success() { - // 准备参数 - String propertyName = "current"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "current"; Double propertyValue = 2.5; Double compareValue = 3.0; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.LESS_THAN_OR_EQUALS.getOperator(), String.valueOf(compareValue) ); @@ -338,13 +383,12 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_stringProperty_success() { - // 准备参数 - String propertyName = "mode"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "mode"; String propertyValue = "auto"; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), propertyValue ); @@ -358,13 +402,12 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { @Test public void testMatches_booleanProperty_success() { - // 准备参数 - String propertyName = "enabled"; + // 准备参数：创建属性上报消息 + String propertyIdentifier = "enabled"; Boolean propertyValue = true; - Map properties = MapUtil.of(propertyName, propertyValue); - IotDeviceMessage message = createDeviceMessage(properties); + IotDeviceMessage message = createPropertyPostMessage(propertyIdentifier, propertyValue); IotSceneRuleDO.TriggerCondition condition = createValidCondition( - propertyName, + propertyIdentifier, IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), String.valueOf(propertyValue) ); @@ -376,40 +419,61 @@ public class DevicePropertyConditionMatcherTest extends BaseMatcherTest { assertTrue(result); } - @Test - public void testMatches_multipleProperties_success() { - // 准备参数 - Map properties = MapUtil.builder(new HashMap()) - .put("temperature", 25.5) - .put("humidity", 60) - .put("status", "active") - .put("enabled", true) - .build(); - IotDeviceMessage message = createDeviceMessage(properties); - String targetProperty = "humidity"; - Integer targetValue = 60; - IotSceneRuleDO.TriggerCondition condition = createValidCondition( - targetProperty, - IotSceneRuleConditionOperatorEnum.EQUALS.getOperator(), - String.valueOf(targetValue) - ); - - // 调用 - boolean result = matcher.matches(message, condition); - - // 断言 - assertTrue(result); - } - // ========== 辅助方法 ========== /** - * 创建设备消息 + * 创建设备消息用于测试 + * + * 支持的消息格式： + * 1. 直接属性值：params 直接是属性值（适用于简单消息） + * 2. 标识符+值：params 包含 identifier 和对应的属性值 + * 3. properties 结构：params.properties[identifier] = value + * 4. data 结构：params.data[identifier] = value + * 5. value 字段：params.value = value */ - private IotDeviceMessage createDeviceMessage(Map properties) { + private IotDeviceMessage createPropertyPostMessage(String identifier, Object value) { IotDeviceMessage message = new IotDeviceMessage(); message.setDeviceId(randomLongId()); - message.setParams(properties); + message.setMethod("thing.event.post"); // 使用事件上报方法 + + // 创建符合修复后逻辑的 params 结构 + Map params = new HashMap<>(); + params.put("identifier", identifier); + // 直接将属性值放在标识符对应的字段中 + params.put(identifier, value); + message.setParams(params); + + return message; + } + + /** + * 创建使用 properties 结构的消息（模拟真实的属性上报消息） + */ + private IotDeviceMessage createPropertyPostMessageWithProperties(String identifier, Object value) { + IotDeviceMessage message = new IotDeviceMessage(); + message.setDeviceId(randomLongId()); + message.setMethod("thing.property.post"); // 属性上报方法 + + Map properties = new HashMap<>(); + properties.put(identifier, value); + + Map params = new HashMap<>(); + params.put("properties", properties); + message.setParams(params); + + return message; + } + + /** + * 创建简单值消息（params 直接是属性值） + */ + private IotDeviceMessage createSimpleValueMessage(Object value) { + IotDeviceMessage message = new IotDeviceMessage(); + message.setDeviceId(randomLongId()); + message.setMethod("thing.property.post"); + // 直接将属性值作为 params + message.setParams(value); + return message; } diff --git a/yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java b/yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java index 5b7778ea0c..65165425c8 100644 --- a/yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java +++ b/yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java @@ -69,6 +69,83 @@ public class IotDeviceMessageUtils { return null; } + /** + * 从设备消息中提取指定标识符的属性值 + * - 支持多种消息格式和属性值提取策略 + * - 兼容现有的消息结构 + * - 提供统一的属性值提取接口 + *

+ * 支持的提取策略（按优先级顺序）： + * 1. 直接值：如果 params 不是 Map，直接返回该值（适用于简单消息） + * 2. 标识符字段：从 params[identifier] 获取 + * 3. properties 结构：从 params.properties[identifier] 获取（标准属性上报） + * 4. data 结构：从 params.data[identifier] 获取 + * 5. value 字段：从 params.value 获取（单值消息） + * 6. 单值 Map：如果 Map 只包含 identifier 和一个值，返回该值 + * + * @param message 设备消息 + * @param identifier 属性标识符 + * @return 属性值，如果未找到则返回 null + */ + @SuppressWarnings("unchecked") + public static Object extractPropertyValue(IotDeviceMessage message, String identifier) { + Object params = message.getParams(); + if (params == null) { + return null; + } + + // 策略1：如果 params 不是 Map，直接返回该值（适用于简单的单属性消息） + if (!(params instanceof Map)) { + return params; + } + + Map paramsMap = (Map) params; + + // 策略2：直接通过标识符获取属性值 + Object directValue = paramsMap.get(identifier); + if (directValue != null) { + return directValue; + } + + // 策略3：从 properties 字段中获取（适用于标准属性上报消息） + Object properties = paramsMap.get("properties"); + if (properties instanceof Map) { + Map propertiesMap = (Map) properties; + Object propertyValue = propertiesMap.get(identifier); + if (propertyValue != null) { + return propertyValue; + } + } + + // 策略4：从 data 字段中获取（适用于某些消息格式） + Object data = paramsMap.get("data"); + if (data instanceof Map) { + Map dataMap = (Map) data; + Object dataValue = dataMap.get(identifier); + if (dataValue != null) { + return dataValue; + } + } + + // 策略5：从 value 字段中获取（适用于单值消息） + Object value = paramsMap.get("value"); + if (value != null) { + return value; + } + + // 策略6：如果 Map 只有两个字段且包含 identifier，返回另一个字段的值 + if (paramsMap.size() == 2 && paramsMap.containsKey("identifier")) { + for (Map.Entry entry : paramsMap.entrySet()) { + if (!"identifier".equals(entry.getKey())) { + return entry.getValue(); + } + } + } + + // 未找到对应的属性值 + return null; + } + // ========== Topic 相关 ========== public static String buildMessageBusGatewayDeviceMessageTopic(String serverId) { diff --git a/yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java b/yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java new file mode 100644 index 0000000000..a6d669d170 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-core/src/test/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtilsTest.java @@ -0,0 +1,141 @@ +package cn.iocoder.yudao.module.iot.core.util; + +import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; +import org.junit.jupiter.api.Test; + +import java.util.HashMap; +import java.util.Map; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +/** + * {@link IotDeviceMessageUtils} 的单元测试 + * + * @author HUIHUI + */ +public class IotDeviceMessageUtilsTest { + + @Test + public void testExtractPropertyValue_directValue() { + // 测试直接值（非 Map） + IotDeviceMessage message = new IotDeviceMessage(); + message.setParams(25.5); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_directIdentifier() { + // 测试直接通过标识符获取 + IotDeviceMessage message = new IotDeviceMessage(); + Map params = new HashMap<>(); + params.put("temperature", 25.5); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_propertiesStructure() { + // 测试 properties 结构 + IotDeviceMessage message = new IotDeviceMessage(); + Map properties = new HashMap<>(); + properties.put("temperature", 25.5); + properties.put("humidity", 60); + + Map params = new HashMap<>(); + params.put("properties", properties); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_dataStructure() { + // 测试 data 结构 + IotDeviceMessage message = new IotDeviceMessage(); + Map data = new HashMap<>(); + data.put("temperature", 25.5); + + Map params = new HashMap<>(); + params.put("data", data); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_valueField() { + // 测试 value 字段 + IotDeviceMessage message = new IotDeviceMessage(); + Map params = new HashMap<>(); + params.put("identifier", "temperature"); + params.put("value", 25.5); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_singleValueMap() { + // 测试单值 Map（包含 identifier 和一个值） + IotDeviceMessage message = new IotDeviceMessage(); + Map params = new HashMap<>(); + params.put("identifier", "temperature"); + params.put("actualValue", 25.5); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); + } + + @Test + public void testExtractPropertyValue_notFound() { + // 测试未找到属性值 + IotDeviceMessage message = new IotDeviceMessage(); + Map params = new HashMap<>(); + params.put("humidity", 60); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertNull(result); + } + + @Test + public void testExtractPropertyValue_nullParams() { + // 测试 params 为 null + IotDeviceMessage message = new IotDeviceMessage(); + message.setParams(null); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertNull(result); + } + + @Test + public void testExtractPropertyValue_priorityOrder() { + // 测试优先级顺序：直接标识符 > properties > data > value + IotDeviceMessage message = new IotDeviceMessage(); + + Map properties = new HashMap<>(); + properties.put("temperature", 20.0); + + Map data = new HashMap<>(); + data.put("temperature", 30.0); + + Map params = new HashMap<>(); + params.put("temperature", 25.5); // 最高优先级 + params.put("properties", properties); + params.put("data", data); + params.put("value", 40.0); + message.setParams(params); + + Object result = IotDeviceMessageUtils.extractPropertyValue(message, "temperature"); + assertEquals(25.5, result); // 应该返回直接标识符的值 + } +} From bc0292eb6122cf3b47141399fb85d4203e0f4c94 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 1 Sep 2025 17:20:15 +0800 Subject: [PATCH 07/80] =?UTF-8?q?feat:=20=E3=80=90IoT=20=E7=89=A9=E8=81=94?= =?UTF-8?q?=E7=BD=91=E3=80=91=E9=87=8D=E6=9E=84=E8=AE=BE=E5=A4=87=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8D=95=E8=AE=BE=E5=A4=87=E5=92=8C=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E8=AE=BE=E5=A4=87=E6=93=8D=E4=BD=9C=E3=80=82=E9=87=8D?= =?UTF-8?q?=E6=9E=84=E8=AE=BE=E5=A4=87=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=EF=BC=8C=E6=94=AF=E6=8C=81=E5=8D=95?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=92=8C=E6=89=B9=E9=87=8F=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IotDeviceControlSceneRuleAction.java | 127 ++++++++++++--- ...IotDeviceServiceInvokeSceneRuleAction.java | 145 ++++++++++++++++++ 2 files changed, 252 insertions(+), 20 deletions(-) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java index b71a92091b..dd10ed8134 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java @@ -1,6 +1,10 @@ package cn.iocoder.yudao.module.iot.service.rule.scene.action; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleActionTypeEnum; import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; @@ -9,8 +13,11 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; + /** - * IoT 设备控制的 {@link IotSceneRuleAction} 实现类 + * IoT 设备属性设置的 {@link IotSceneRuleAction} 实现类 * * @author 芋道源码 */ @@ -23,28 +30,108 @@ public class IotDeviceControlSceneRuleAction implements IotSceneRuleAction { @Resource private IotDeviceMessageService deviceMessageService; - // TODO @puhui999：这里 @Override public void execute(IotDeviceMessage message, IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { - //IotSceneRuleDO.ActionDeviceControl control = actionConfig.getDeviceControl(); - //Assert.notNull(control, "设备控制配置不能为空"); - //// 遍历每个设备，下发消息 - //control.getDeviceNames().forEach(deviceName -> { - // IotDeviceDO device = deviceService.getDeviceFromCache(control.getProductKey(), deviceName); - // if (device == null) { - // log.error("[execute][message({}) actionConfig({}) 对应的设备不存在]", message, actionConfig); - // return; - // } - // try { - // // TODO @芋艿：@puhui999：这块可能要改，从 type => method - // IotDeviceMessage downstreamMessage = deviceMessageService.sendDeviceMessage(IotDeviceMessage.requestOf( - // control.getType() + control.getIdentifier(), control.getData()).setDeviceId(device.getId())); - // log.info("[execute][message({}) actionConfig({}) 下发消息({})成功]", message, actionConfig, downstreamMessage); - // } catch (Exception e) { - // log.error("[execute][message({}) actionConfig({}) 下发消息失败]", message, actionConfig, e); - // } - //}); + // 1. 参数校验 + if (actionConfig.getDeviceId() == null) { + log.error("[execute][规则场景({}) 动作配置({}) 设备编号不能为空]", rule.getId(), actionConfig); + return; + } + if (StrUtil.isEmpty(actionConfig.getIdentifier())) { + log.error("[execute][规则场景({}) 动作配置({}) 属性标识符不能为空]", rule.getId(), actionConfig); + return; + } + + // 2. 判断是否为全部设备 + if (IotDeviceDO.DEVICE_ID_ALL.equals(actionConfig.getDeviceId())) { + executeForAllDevices(message, rule, actionConfig); + } else { + executeForSingleDevice(message, rule, actionConfig); + } + } + + /** + * 为单个设备执行属性设置 + */ + private void executeForSingleDevice(IotDeviceMessage message, + IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { + // 1. 获取设备信息 + IotDeviceDO device = deviceService.getDeviceFromCache(actionConfig.getDeviceId()); + if (device == null) { + log.error("[executeForSingleDevice][规则场景({}) 动作配置({}) 对应的设备({}) 不存在]", + rule.getId(), actionConfig, actionConfig.getDeviceId()); + return; + } + + // 2. 执行属性设置 + executePropertySetForDevice(rule, actionConfig, device); + } + + /** + * 为产品下的所有设备执行属性设置 + */ + private void executeForAllDevices(IotDeviceMessage message, + IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { + // 1. 参数校验 + if (actionConfig.getProductId() == null) { + log.error("[executeForAllDevices][规则场景({}) 动作配置({}) 产品编号不能为空]", rule.getId(), actionConfig); + return; + } + + // 2. 获取产品下的所有设备 + List devices = deviceService.getDeviceListByProductId(actionConfig.getProductId()); + if (CollUtil.isEmpty(devices)) { + log.warn("[executeForAllDevices][规则场景({}) 动作配置({}) 产品({}) 下没有设备]", + rule.getId(), actionConfig, actionConfig.getProductId()); + return; + } + + // 3. 遍历所有设备执行属性设置 + for (IotDeviceDO device : devices) { + executePropertySetForDevice(rule, actionConfig, device); + } + } + + /** + * 为指定设备执行属性设置 + */ + private void executePropertySetForDevice(IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig, IotDeviceDO device) { + // 1. 构建属性设置消息 + IotDeviceMessage downstreamMessage = buildPropertySetMessage(actionConfig, device); + if (downstreamMessage == null) { + log.error("[executePropertySetForDevice][规则场景({}) 动作配置({}) 设备({}) 构建属性设置消息失败]", + rule.getId(), actionConfig, device.getId()); + return; + } + + // 2. 发送设备消息 + try { + IotDeviceMessage result = deviceMessageService.sendDeviceMessage(downstreamMessage, device); + log.info("[executePropertySetForDevice][规则场景({}) 动作配置({}) 设备({}) 属性设置消息({}) 发送成功]", + rule.getId(), actionConfig, device.getId(), result.getId()); + } catch (Exception e) { + log.error("[executePropertySetForDevice][规则场景({}) 动作配置({}) 设备({}) 属性设置消息发送失败]", + rule.getId(), actionConfig, device.getId(), e); + } + } + + /** + * 构建属性设置消息 + * + * @param actionConfig 动作配置 + * @param device 设备信息 + * @return 设备消息 + */ + private IotDeviceMessage buildPropertySetMessage(IotSceneRuleDO.Action actionConfig, IotDeviceDO device) { + try { + // 属性设置参数格式: {"properties": {"identifier": value}} + Object params = Map.of("properties", Map.of(actionConfig.getIdentifier(), actionConfig.getParams())); + return IotDeviceMessage.requestOf(IotDeviceMessageMethodEnum.PROPERTY_SET.getMethod(), params); + } catch (Exception e) { + log.error("[buildPropertySetMessage][构建属性设置消息异常]", e); + return null; + } } @Override diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java new file mode 100644 index 0000000000..eb7bedf2f0 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java @@ -0,0 +1,145 @@ +package cn.iocoder.yudao.module.iot.service.rule.scene.action; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum; +import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage; +import cn.iocoder.yudao.module.iot.dal.dataobject.device.IotDeviceDO; +import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleActionTypeEnum; +import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; +import cn.iocoder.yudao.module.iot.service.device.message.IotDeviceMessageService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +/** + * IoT 设备服务调用的 {@link IotSceneRuleAction} 实现类 + * + * @author HUIHUI + */ +@Component +@Slf4j +public class IotDeviceServiceInvokeSceneRuleAction implements IotSceneRuleAction { + + @Resource + private IotDeviceService deviceService; + @Resource + private IotDeviceMessageService deviceMessageService; + + @Override + public void execute(IotDeviceMessage message, + IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { + // 1. 参数校验 + if (actionConfig.getDeviceId() == null) { + log.error("[execute][规则场景({}) 动作配置({}) 设备编号不能为空]", rule.getId(), actionConfig); + return; + } + if (StrUtil.isEmpty(actionConfig.getIdentifier())) { + log.error("[execute][规则场景({}) 动作配置({}) 服务标识符不能为空]", rule.getId(), actionConfig); + return; + } + + // 2. 判断是否为全部设备 + if (IotDeviceDO.DEVICE_ID_ALL.equals(actionConfig.getDeviceId())) { + executeForAllDevices(message, rule, actionConfig); + } else { + executeForSingleDevice(message, rule, actionConfig); + } + } + + /** + * 为单个设备执行服务调用 + */ + private void executeForSingleDevice(IotDeviceMessage message, + IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { + // 1. 获取设备信息 + IotDeviceDO device = deviceService.getDeviceFromCache(actionConfig.getDeviceId()); + if (device == null) { + log.error("[executeForSingleDevice][规则场景({}) 动作配置({}) 对应的设备({}) 不存在]", + rule.getId(), actionConfig, actionConfig.getDeviceId()); + return; + } + + // 2. 执行服务调用 + executeServiceInvokeForDevice(rule, actionConfig, device); + } + + /** + * 为产品下的所有设备执行服务调用 + */ + private void executeForAllDevices(IotDeviceMessage message, + IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig) { + // 1. 参数校验 + if (actionConfig.getProductId() == null) { + log.error("[executeForAllDevices][规则场景({}) 动作配置({}) 产品编号不能为空]", rule.getId(), actionConfig); + return; + } + + // 2. 获取产品下的所有设备 + List devices = deviceService.getDeviceListByProductId(actionConfig.getProductId()); + if (CollUtil.isEmpty(devices)) { + log.warn("[executeForAllDevices][规则场景({}) 动作配置({}) 产品({}) 下没有设备]", + rule.getId(), actionConfig, actionConfig.getProductId()); + return; + } + + // 3. 遍历所有设备执行服务调用 + for (IotDeviceDO device : devices) { + executeServiceInvokeForDevice(rule, actionConfig, device); + } + } + + /** + * 为指定设备执行服务调用 + */ + private void executeServiceInvokeForDevice(IotSceneRuleDO rule, IotSceneRuleDO.Action actionConfig, IotDeviceDO device) { + // 1. 构建服务调用消息 + IotDeviceMessage downstreamMessage = buildServiceInvokeMessage(actionConfig, device); + if (downstreamMessage == null) { + log.error("[executeServiceInvokeForDevice][规则场景({}) 动作配置({}) 设备({}) 构建服务调用消息失败]", + rule.getId(), actionConfig, device.getId()); + return; + } + + // 2. 发送设备消息 + try { + IotDeviceMessage result = deviceMessageService.sendDeviceMessage(downstreamMessage, device); + log.info("[executeServiceInvokeForDevice][规则场景({}) 动作配置({}) 设备({}) 服务调用消息({}) 发送成功]", + rule.getId(), actionConfig, device.getId(), result.getId()); + } catch (Exception e) { + log.error("[executeServiceInvokeForDevice][规则场景({}) 动作配置({}) 设备({}) 服务调用消息发送失败]", + rule.getId(), actionConfig, device.getId(), e); + } + } + + /** + * 构建服务调用消息 + * + * @param actionConfig 动作配置 + * @param device 设备信息 + * @return 设备消息 + */ + private IotDeviceMessage buildServiceInvokeMessage(IotSceneRuleDO.Action actionConfig, IotDeviceDO device) { + try { + // 服务调用参数格式: {"identifier": "serviceId", "params": {...}} + Object params = Map.of( + "identifier", actionConfig.getIdentifier(), + "params", actionConfig.getParams() != null ? actionConfig.getParams() : Map.of() + ); + return IotDeviceMessage.requestOf(IotDeviceMessageMethodEnum.SERVICE_INVOKE.getMethod(), params); + } catch (Exception e) { + log.error("[buildServiceInvokeMessage][构建服务调用消息异常]", e); + return null; + } + } + + @Override + public IotSceneRuleActionTypeEnum getType() { + return IotSceneRuleActionTypeEnum.DEVICE_SERVICE_INVOKE; + } + +} From 1cdae71d9484d6827d1e06432e5d98d1e92258a7 Mon Sep 17 00:00:00 2001 From: puhui999 Date: Mon, 1 Sep 2025 17:48:20 +0800 Subject: [PATCH 08/80] =?UTF-8?q?feat:=20=E3=80=90IoT=20=E7=89=A9=E8=81=94?= =?UTF-8?q?=E7=BD=91=E3=80=91=E5=AE=9E=E7=8E=B0=E5=9C=BA=E6=99=AF=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=AE=9A=E6=97=B6=E8=A7=A6=E5=8F=91=E5=99=A8=E7=9A=84?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=99=A8=E5=A4=84=E7=90=86=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=BA=E6=99=AF=E8=A7=84=E5=88=99=E7=9A=84?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B3=A8=E5=86=8C=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=80=81=E5=88=A0=E9=99=A4=E7=AD=89=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/scene/IotSceneRuleServiceImpl.java | 28 ++- .../scene/timer/IotSceneRuleTimerHandler.java | 178 ++++++++++++++++++ 2 files changed, 202 insertions(+), 4 deletions(-) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java index 7cbc5b56be..ee7351f717 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java @@ -17,11 +17,11 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.product.IotProductDO; import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; import cn.iocoder.yudao.module.iot.dal.mysql.rule.IotSceneRuleMapper; import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; -import cn.iocoder.yudao.module.iot.framework.job.core.IotSchedulerManager; import cn.iocoder.yudao.module.iot.service.device.IotDeviceService; import cn.iocoder.yudao.module.iot.service.product.IotProductService; import cn.iocoder.yudao.module.iot.service.rule.scene.action.IotSceneRuleAction; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcherManager; +import cn.iocoder.yudao.module.iot.service.rule.scene.timer.IotSceneRuleTimerHandler; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -47,9 +47,6 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { @Resource private IotSceneRuleMapper sceneRuleMapper; - // TODO @puhui999：定时任务，基于它调度； - @Resource(name = "iotSchedulerManager") - private IotSchedulerManager schedulerManager; @Resource private IotProductService productService; @Resource @@ -59,11 +56,17 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { private IotSceneRuleMatcherManager sceneRuleMatcherManager; @Resource private List sceneRuleActions; + @Resource + private IotSceneRuleTimerHandler timerHandler; @Override public Long createSceneRule(IotSceneRuleSaveReqVO createReqVO) { IotSceneRuleDO sceneRule = BeanUtils.toBean(createReqVO, IotSceneRuleDO.class); sceneRuleMapper.insert(sceneRule); + + // 注册定时触发器 + timerHandler.registerTimerTriggers(sceneRule); + return sceneRule.getId(); } @@ -74,6 +77,9 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { // 更新 IotSceneRuleDO updateObj = BeanUtils.toBean(updateReqVO, IotSceneRuleDO.class); sceneRuleMapper.updateById(updateObj); + + // 更新定时触发器 + timerHandler.updateTimerTriggers(updateObj); } @Override @@ -83,12 +89,26 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { // 更新状态 IotSceneRuleDO updateObj = new IotSceneRuleDO().setId(id).setStatus(status); sceneRuleMapper.updateById(updateObj); + + // 根据状态管理定时触发器 + if (CommonStatusEnum.isEnable(status)) { + // 启用时，获取完整的场景规则信息并注册定时触发器 + IotSceneRuleDO sceneRule = sceneRuleMapper.selectById(id); + if (sceneRule != null) { + timerHandler.registerTimerTriggers(sceneRule); + } + } else { + // 禁用时，暂停定时触发器 + timerHandler.pauseTimerTriggers(id); + } } @Override public void deleteSceneRule(Long id) { // 校验存在 validateSceneRuleExists(id); + // 删除定时触发器 + timerHandler.unregisterTimerTriggers(id); // 删除 sceneRuleMapper.deleteById(id); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java new file mode 100644 index 0000000000..ddb6367506 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java @@ -0,0 +1,178 @@ +package cn.iocoder.yudao.module.iot.service.rule.scene.timer; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjUtil; +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.module.iot.dal.dataobject.rule.IotSceneRuleDO; +import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; +import cn.iocoder.yudao.module.iot.framework.job.core.IotSchedulerManager; +import cn.iocoder.yudao.module.iot.job.rule.IotSceneRuleJob; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.quartz.SchedulerException; +import org.springframework.stereotype.Component; + +import java.util.List; + +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList; + +/** + * IoT 场景规则定时触发器处理器 + *

+ * 负责管理定时触发器的注册、更新、删除等操作 + * + * @author HUIHUI + */ +@Component +@Slf4j +public class IotSceneRuleTimerHandler { + + @Resource(name = "iotSchedulerManager") + private IotSchedulerManager schedulerManager; + + /** + * 注册场景规则的定时触发器 + * + * @param sceneRule 场景规则 + */ + public void registerTimerTriggers(IotSceneRuleDO sceneRule) { + if (sceneRule == null || CollUtil.isEmpty(sceneRule.getTriggers())) { + return; + } + + // 过滤出定时触发器 + List timerTriggers = filterList(sceneRule.getTriggers(), + trigger -> ObjUtil.equals(trigger.getType(), IotSceneRuleTriggerTypeEnum.TIMER.getType())); + + if (CollUtil.isEmpty(timerTriggers)) { + return; + } + + // 注册每个定时触发器 + timerTriggers.forEach(trigger -> registerSingleTimerTrigger(sceneRule, trigger)); + } + + /** + * 更新场景规则的定时触发器 + * + * @param sceneRule 场景规则 + */ + public void updateTimerTriggers(IotSceneRuleDO sceneRule) { + if (sceneRule == null) { + return; + } + + // 先删除旧的定时任务 + unregisterTimerTriggers(sceneRule.getId()); + + // 如果场景规则已禁用，则不重新注册 + if (CommonStatusEnum.isDisable(sceneRule.getStatus())) { + log.info("[updateTimerTriggers][场景规则({}) 已禁用，不注册定时触发器]", sceneRule.getId()); + return; + } + + // 重新注册定时触发器 + registerTimerTriggers(sceneRule); + } + + /** + * 注销场景规则的定时触发器 + * + * @param sceneRuleId 场景规则ID + */ + public void unregisterTimerTriggers(Long sceneRuleId) { + if (sceneRuleId == null) { + return; + } + + String jobName = buildJobName(sceneRuleId); + try { + schedulerManager.deleteJob(jobName); + log.info("[unregisterTimerTriggers][场景规则({}) 定时触发器注销成功]", sceneRuleId); + } catch (SchedulerException e) { + log.error("[unregisterTimerTriggers][场景规则({}) 定时触发器注销失败]", sceneRuleId, e); + } + } + + /** + * 暂停场景规则的定时触发器 + * + * @param sceneRuleId 场景规则ID + */ + public void pauseTimerTriggers(Long sceneRuleId) { + if (sceneRuleId == null) { + return; + } + + String jobName = buildJobName(sceneRuleId); + try { + schedulerManager.pauseJob(jobName); + log.info("[pauseTimerTriggers][场景规则({}) 定时触发器暂停成功]", sceneRuleId); + } catch (SchedulerException e) { + log.error("[pauseTimerTriggers][场景规则({}) 定时触发器暂停失败]", sceneRuleId, e); + } + } + + /** + * 恢复场景规则的定时触发器 + * + * @param sceneRuleId 场景规则ID + */ + public void resumeTimerTriggers(Long sceneRuleId) { + if (sceneRuleId == null) { + return; + } + + String jobName = buildJobName(sceneRuleId); + try { + schedulerManager.resumeJob(jobName); + log.info("[resumeTimerTriggers][场景规则({}) 定时触发器恢复成功]", sceneRuleId); + } catch (SchedulerException e) { + log.error("[resumeTimerTriggers][场景规则({}) 定时触发器恢复失败]", sceneRuleId, e); + } + } + + /** + * 注册单个定时触发器 + * + * @param sceneRule 场景规则 + * @param trigger 定时触发器配置 + */ + private void registerSingleTimerTrigger(IotSceneRuleDO sceneRule, IotSceneRuleDO.Trigger trigger) { + // 1. 参数校验 + if (StrUtil.isBlank(trigger.getCronExpression())) { + log.error("[registerSingleTimerTrigger][场景规则({}) 定时触发器缺少 CRON 表达式]", sceneRule.getId()); + return; + } + + // 2. 构建任务名称和数据 + String jobName = buildJobName(sceneRule.getId()); + + try { + // 3. 注册定时任务 + schedulerManager.addOrUpdateJob( + IotSceneRuleJob.class, + jobName, + trigger.getCronExpression(), + IotSceneRuleJob.buildJobDataMap(sceneRule.getId()) + ); + + log.info("[registerSingleTimerTrigger][场景规则({}) 定时触发器注册成功，CRON: {}]", + sceneRule.getId(), trigger.getCronExpression()); + } catch (SchedulerException e) { + log.error("[registerSingleTimerTrigger][场景规则({}) 定时触发器注册失败，CRON: {}]", + sceneRule.getId(), trigger.getCronExpression(), e); + } + } + + /** + * 构建任务名称 + * + * @param sceneRuleId 场景规则ID + * @return 任务名称 + */ + private String buildJobName(Long sceneRuleId) { + return "iot_scene_rule_timer_" + sceneRuleId; + } +} From fd064abfbe83310765faed10c259c7abd9900519 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 2 Sep 2025 09:43:26 +0800 Subject: [PATCH 09/80] =?UTF-8?q?fix=EF=BC=9A=E3=80=90infra=20=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E3=80=91=E5=AF=BC=E5=87=BA=20excel?= =?UTF-8?q?=20=E5=8F=82=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/codegen/vue3/views/components/list_sub_erp.vue.vm | 2 +- .../src/main/resources/codegen/vue3/views/index.vue.vm | 2 +- .../resources/codegen/vue3_vben5_antd/general/api/api.ts.vm | 2 +- .../codegen/vue3_vben5_antd/general/views/index.vue.vm | 2 +- .../vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm | 2 +- .../main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm | 2 +- .../resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm | 2 +- .../vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm | 2 +- .../main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm | 2 +- .../resources/codegen/vue3_vben5_ele/general/views/index.vue.vm | 2 +- .../vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm | 2 +- .../main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm | 2 +- .../resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm | 2 +- .../vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/yudao-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm index a94cab5a59..29df64de16 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm @@ -217,7 +217,7 @@ const handleDeleteBatch = async () => { const checkedIds = ref([]) const handleRowCheckboxChange = (records: ${subSimpleClassName}[]) => { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm index dfb97804ce..fb7485d6d5 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm @@ -374,7 +374,7 @@ const handleDeleteBatch = async () => { const checkedIds = ref([]) const handleRowCheckboxChange = (records: ${simpleClassName}[]) => { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm index 090b14845b..c3691a8b73 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm index 6553ed0c87..e1c2b08f26 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/index.vue.vm @@ -182,7 +182,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${simpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm index 999257d91d..3ff72bf931 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/views/modules/list_sub_erp.vue.vm @@ -106,7 +106,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${subSimpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm index 875cd6bb8f..682e5923ae 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm index 1e13de2e97..493603d801 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm @@ -119,7 +119,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${simpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm index e046226efc..3cc6be8246 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/list_sub_erp.vue.vm @@ -99,7 +99,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${subSimpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm index 090b14845b..c3691a8b73 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm index ae77cd4c7b..14d5bb3cae 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/index.vue.vm @@ -177,7 +177,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${simpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm index ccad79a0d9..11cd4750b1 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/views/modules/list_sub_erp.vue.vm @@ -101,7 +101,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${subSimpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm index 875cd6bb8f..682e5923ae 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm index c29beb9aa9..203db04830 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm @@ -113,7 +113,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${simpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm index 13a2415efd..f2787a0ebc 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/list_sub_erp.vue.vm @@ -93,7 +93,7 @@ function handleRowCheckboxChange({ }: { records: ${simpleClassName}Api.${subSimpleClassName}[]; }) { - checkedIds.value = records.map((item) => item.id); + checkedIds.value = records.map((item) => item.id!); } #end From acbe083c7f0fa41fce13fd6c7744094002719992 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Tue, 2 Sep 2025 17:02:58 +0800 Subject: [PATCH 10/80] =?UTF-8?q?feat:=20=E5=AE=9E=E7=8E=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/BpmProcessInstanceController.java | 8 + .../instance/BpmProcessPrintDataRespVO.java | 65 ++++++++ .../task/BpmProcessInstanceStatusEnum.java | 5 + .../bpm/enums/task/BpmTaskStatusEnum.java | 5 + .../task/BpmProcessInstanceService.java | 8 + .../task/BpmProcessInstanceServiceImpl.java | 143 ++++++++++++++++++ 6 files changed, 234 insertions(+) create mode 100644 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java index 8a3777772e..b66555cda3 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java @@ -196,4 +196,12 @@ public class BpmProcessInstanceController { return success(processInstanceService.getProcessInstanceBpmnModelView(id)); } + @GetMapping("/get-print-data") + @Operation(summary = "获得打印数据") + @Parameter(name = "id", description = "流程实例的编号", required = true) + @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')") + public CommonResult getPrintData(@RequestParam("processInstanceId") String processInstanceId) { + return success(processInstanceService.getPrintData(getLoginUserId(), processInstanceId)); + } + } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java new file mode 100644 index 0000000000..a7897f1845 --- /dev/null +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java @@ -0,0 +1,65 @@ +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; + + +@Schema(description = "管理后台 - 打印数据 Response VO") +@Data +public class BpmProcessPrintDataRespVO { + + private Boolean printTemplateEnable; + + private Integer processStatus; + + private String processStatusShow; + + private String processInstanceId; + + private String processBusinessKey; + + private String processName; + + private String startUser; + + private String startUserDept; + + private String startTime; + + private List approveNodes; + + private List formFields; + + private String printTemplateHtml; + + @Data + public static class ApproveNode { + + private String nodeName; + + private String nodeDesc; + + private String signUrl; + + private String nodeId; + + } + + @Data + public static class FormField { + + private String formId; + + private String formName; + + private String formType; + + private String formValue; + + private String formValueShow; + + } + +} diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java index 5b42df50fe..87be32633b 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.bpm.enums.task; +import cn.hutool.core.util.ArrayUtil; import cn.iocoder.yudao.framework.common.core.ArrayValuable; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; @@ -47,4 +48,8 @@ public enum BpmProcessInstanceStatusEnum implements ArrayValuable { APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus()); } + public static BpmProcessInstanceStatusEnum valueOf(Integer status) { + return ArrayUtil.firstMatch(item -> item.getStatus().equals(status), values()); + } + } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java index 9ba3b5cb3a..0f69c42795 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.bpm.enums.task; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import lombok.AllArgsConstructor; @@ -68,4 +69,8 @@ public enum BpmTaskStatusEnum { return ObjUtil.equal(status, CANCEL.getStatus()); } + public static BpmTaskStatusEnum valueOf(Integer status) { + return ArrayUtil.firstMatch(item -> item.getStatus().equals(status), values()); + } + } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java index abba2245e2..33e667716b 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java @@ -113,6 +113,14 @@ public interface BpmProcessInstanceService { */ BpmProcessInstanceBpmnModelViewRespVO getProcessInstanceBpmnModelView(String id); + /** + * 获取流程打印所需数据 + * @param loginUserId 打印人 + * @param processInstanceId 流程实例id + * @return 打印所需数据 + */ + BpmProcessPrintDataRespVO getPrintData(Long loginUserId, String processInstanceId); + // ========== Update 写入相关方法 ========== /** diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 9dfb98725c..153e51bfc3 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -2,9 +2,13 @@ package cn.iocoder.yudao.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.*; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.date.DateUtils; @@ -57,6 +61,10 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.runtime.ProcessInstanceBuilder; import org.flowable.task.api.Task; import org.flowable.task.api.history.HistoricTaskInstance; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -726,6 +734,141 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService userMap, deptMap); } + @Override + public BpmProcessPrintDataRespVO getPrintData(Long loginUserId, String processInstanceId) { + // TODO 方法抽离 + // 流程实例 + HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(processInstanceId); + if (historicProcessInstance == null) { + throw exception(PROCESS_INSTANCE_NOT_EXISTS); + } + // 准备数据 + BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService + .getProcessDefinitionInfo(historicProcessInstance.getProcessDefinitionId()); + BpmModelMetaInfoVO.PrintTemplateSetting printTemplateSetting = processDefinitionInfo.getPrintTemplateSetting(); + List formFieldList = processDefinitionInfo.getFormFields(); + List formFieldObjList = formFieldList.stream().map(JSONUtil::parseObj).toList(); + List tasks = historyService.createHistoricTaskInstanceQuery() + .finished() + .includeTaskLocalVariables() + .processInstanceId(processInstanceId) + .taskVariableValueNotEquals(BpmnVariableConstants.TASK_VARIABLE_STATUS, + BpmTaskStatusEnum.CANCEL.getStatus()) + .orderByHistoricTaskInstanceStartTime().asc().list(); + Set userIds = convertSet(tasks, item -> Long.valueOf(item.getAssignee())); + userIds.add(loginUserId); + Map userMap = adminUserApi.getUserMap(userIds); + HashMap printDataMap = new HashMap<>(8 + formFieldList.size()); + // 返回打印所需数据 + BpmProcessPrintDataRespVO printData = new BpmProcessPrintDataRespVO(); + // 打印模板是否开启 + printData.setPrintTemplateEnable(printTemplateSetting != null && Boolean.TRUE.equals(printTemplateSetting.getEnable())); + // 流程相关数据 + printData.setProcessStatus(FlowableUtils.getProcessInstanceStatus(historicProcessInstance)); + printData.setProcessStatusShow(BpmProcessInstanceStatusEnum.valueOf(printData.getProcessStatus()).getDesc()); + printData.setProcessInstanceId(historicProcessInstance.getId()); + printData.setProcessName(historicProcessInstance.getName()); + printData.setProcessBusinessKey(historicProcessInstance.getBusinessKey()); + printData.setStartTime(DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(historicProcessInstance.getStartTime())); + // 发起人 + AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(historicProcessInstance.getStartUserId())); + DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); + printData.setStartUser(startUser.getNickname()); + printData.setStartUserDept(dept.getName()); + // 审批历史 + List approveNodes = new ArrayList<>(tasks.size()); + tasks.forEach(item -> { + Map taskLocalVariables = item.getTaskLocalVariables(); + BpmProcessPrintDataRespVO.ApproveNode approveNode = new BpmProcessPrintDataRespVO.ApproveNode(); + approveNode.setNodeName(item.getName()); + approveNode.setNodeId(item.getId()); + approveNode.setSignUrl((String) taskLocalVariables.getOrDefault(BpmnVariableConstants.TASK_SIGN_PIC_URL, "")); + approveNode.setNodeDesc(StrUtil.format("{} / {} / {} / {} / {}", + userMap.get(Long.valueOf(item.getAssignee())).getNickname(), + item.getName(), + DateUtil.formatDateTime(item.getEndTime()), + BpmTaskStatusEnum.valueOf((Integer) taskLocalVariables.get(BpmnVariableConstants.TASK_VARIABLE_STATUS)).getName(), + taskLocalVariables.get(BpmnVariableConstants.TASK_VARIABLE_REASON))); + approveNodes.add(approveNode); + }); + printData.setApproveNodes(approveNodes); + // 表单数据 + Map processVariables = historicProcessInstance.getProcessVariables(); + List formFields = new ArrayList<>(formFieldList.size()); + formFieldObjList.forEach(item -> { + BpmProcessPrintDataRespVO.FormField formField = new BpmProcessPrintDataRespVO.FormField(); + formField.setFormName(item.getStr("title")); + formField.setFormType(item.getStr("type")); + formField.setFormId(item.getStr("field")); + formField.setFormValue(processVariables.get(item.getStr("field")).toString()); + // TODO 根据不同类型的表单展示，下面为图片和输入框示例 + if (formField.getFormType().equals("input")) { + formField.setFormValueShow(processVariables.get(item.getStr("field")).toString()); + } else if (formField.getFormType().equals("UploadImg")) { + formField.setFormValueShow(""); + } else { + formField.setFormValueShow("此类型表单展示未完善"); + } + printDataMap.put(formField.getFormId(), formField.getFormValueShow()); + formFields.add(formField); + }); + printData.setFormFields(formFields); + // 数据映射 + printDataMap.put("processName", printData.getProcessName()); + printDataMap.put("printUsername", userMap.get(loginUserId).getNickname()); + printDataMap.put("processNum", printData.getProcessInstanceId()); + printDataMap.put("printTime", DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(new DateTime())); + printDataMap.put("startUser", printData.getStartUser()); + printDataMap.put("startTime", printData.getStartTime()); + printDataMap.put("startUserDept", printData.getStartUserDept()); + printDataMap.put("processStatus", printData.getProcessStatusShow()); + // 自定义模板 + if (printData.getPrintTemplateEnable() && printTemplateSetting != null) { + Document document = Jsoup.parse(printTemplateSetting.getTemplate()); + // 添加table的border + Elements tables = document.select("table"); + tables.forEach(item -> { + item.attr("border", "1"); + }); + // 替换所有mention + Elements mention = document.getElementsByAttributeValue("data-w-e-type", "mention"); + mention.forEach(item -> { + String mentionId = JSONUtil.parseObj(URLUtil.decode(item.attr("data-info"))).getStr("id"); + item.html(printDataMap.get(mentionId)); + }); + // 替换流程记录 + Elements processRecords = document.getElementsByAttributeValue("data-w-e-type", "process-record"); + Element processRecordElement = null; + if (!processRecords.isEmpty()) { + processRecordElement = new Element("table", "") + .attr("style", "width:100%;") + .attr("border", "1"); + Element tbody = new Element("tbody", ""); + Element rowHead = new Element("tr", ""); + rowHead.appendChild(new Element("td", "") + .attr("colspan", "2") + .attr("width", "auto") + .attr("style", "text-align: center;") + .html("流程节点")); + tbody.appendChild(rowHead); + for (BpmProcessPrintDataRespVO.ApproveNode item : printData.getApproveNodes()) { + Element row = new Element("tr", ""); + row.appendChild(new Element("td", "") + .html(item.getNodeName())); + row.appendChild(new Element("td", "") + .html(item.getNodeDesc())); + tbody.appendChild(row); + } + processRecordElement.appendChild(tbody); + } + for (Element item : processRecords) { + item.html(processRecordElement.outerHtml()); + } + printData.setPrintTemplateHtml(document.html()); + } + return printData; + } + // ========== Update 写入相关方法 ========== @Override From 21f62b17b15957854dce21483dc5874419daa1e3 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Tue, 2 Sep 2025 17:08:06 +0800 Subject: [PATCH 11/80] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/service/task/BpmProcessInstanceServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 153e51bfc3..d5c0a10931 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -800,12 +800,12 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService formField.setFormName(item.getStr("title")); formField.setFormType(item.getStr("type")); formField.setFormId(item.getStr("field")); - formField.setFormValue(processVariables.get(item.getStr("field")).toString()); + formField.setFormValue(processVariables.getOrDefault(item.getStr("field"), "").toString()); // TODO 根据不同类型的表单展示，下面为图片和输入框示例 if (formField.getFormType().equals("input")) { - formField.setFormValueShow(processVariables.get(item.getStr("field")).toString()); + formField.setFormValueShow(processVariables.getOrDefault(item.getStr("field"), "").toString()); } else if (formField.getFormType().equals("UploadImg")) { - formField.setFormValueShow(""); + formField.setFormValueShow(""); } else { formField.setFormValueShow("此类型表单展示未完善"); } From 9b426436bee0f12b0285c8db2331b49c04acd865 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 3 Sep 2025 13:24:54 +0800 Subject: [PATCH 12/80] =?UTF-8?q?review=EF=BC=9A=E3=80=90bpm=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/task/BpmProcessInstanceController.java | 10 ++++++---- .../task/vo/instance/BpmProcessPrintDataRespVO.java | 6 ++++-- .../bpm/service/task/BpmProcessInstanceService.java | 2 +- .../service/task/BpmProcessInstanceServiceImpl.java | 12 ++++++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java index b66555cda3..9eef45cd1c 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java @@ -192,16 +192,18 @@ public class BpmProcessInstanceController { @GetMapping("/get-bpmn-model-view") @Operation(summary = "获取流程实例的 BPMN 模型视图", description = "在【流程详细】界面中，进行调用") @Parameter(name = "id", description = "流程实例的编号", required = true) - public CommonResult getProcessInstanceBpmnModelView(@RequestParam(value = "id") String id) { + public CommonResult getProcessInstanceBpmnModelView( + @RequestParam(value = "id") String id) { return success(processInstanceService.getProcessInstanceBpmnModelView(id)); } @GetMapping("/get-print-data") - @Operation(summary = "获得打印数据") + @Operation(summary = "获得流程实例的打印数据") @Parameter(name = "id", description = "流程实例的编号", required = true) @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')") - public CommonResult getPrintData(@RequestParam("processInstanceId") String processInstanceId) { - return success(processInstanceService.getPrintData(getLoginUserId(), processInstanceId)); + public CommonResult getProcessInstancePrintData( + @RequestParam("processInstanceId") String processInstanceId) { + return success(processInstanceService.getProcessInstancePrintData(getLoginUserId(), processInstanceId)); } } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java index a7897f1845..a1a0047a00 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java @@ -5,8 +5,8 @@ import lombok.Data; import java.util.List; - -@Schema(description = "管理后台 - 打印数据 Response VO") +// TODO @lesan：这个可能复用 BpmApprovalDetailRespVO 哇？ +@Schema(description = "管理后台 - 流程实例的打印数据 Response VO") @Data public class BpmProcessPrintDataRespVO { @@ -14,6 +14,7 @@ public class BpmProcessPrintDataRespVO { private Integer processStatus; + // TODO @lesan：通过字典？ private String processStatusShow; private String processInstanceId; @@ -22,6 +23,7 @@ public class BpmProcessPrintDataRespVO { private String processName; + // TODO @lesan：UserSimpleBaseVO 替代 startUser、startUserDept； private String startUser; private String startUserDept; diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java index 33e667716b..fd0a2aaca8 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java @@ -119,7 +119,7 @@ public interface BpmProcessInstanceService { * @param processInstanceId 流程实例id * @return 打印所需数据 */ - BpmProcessPrintDataRespVO getPrintData(Long loginUserId, String processInstanceId); + BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId); // ========== Update 写入相关方法 ========== diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 9c2c06525a..7fedca1880 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -735,7 +735,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService } @Override - public BpmProcessPrintDataRespVO getPrintData(Long loginUserId, String processInstanceId) { + public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) { // TODO 方法抽离 // 流程实例 HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(processInstanceId); @@ -747,7 +747,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService .getProcessDefinitionInfo(historicProcessInstance.getProcessDefinitionId()); BpmModelMetaInfoVO.PrintTemplateSetting printTemplateSetting = processDefinitionInfo.getPrintTemplateSetting(); List formFieldList = processDefinitionInfo.getFormFields(); - List formFieldObjList = formFieldList.stream().map(JSONUtil::parseObj).toList(); + List formFieldObjList = formFieldList != null ? formFieldList.stream().map(JSONUtil::parseObj).toList() + : ListUtil.of(); List tasks = historyService.createHistoricTaskInstanceQuery() .finished() .includeTaskLocalVariables() @@ -758,7 +759,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService Set userIds = convertSet(tasks, item -> Long.valueOf(item.getAssignee())); userIds.add(loginUserId); Map userMap = adminUserApi.getUserMap(userIds); - HashMap printDataMap = new HashMap<>(8 + formFieldList.size()); + HashMap printDataMap = new HashMap<>(8 + formFieldObjList.size()); // 返回打印所需数据 BpmProcessPrintDataRespVO printData = new BpmProcessPrintDataRespVO(); // 打印模板是否开启 @@ -776,6 +777,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService printData.setStartUser(startUser.getNickname()); printData.setStartUserDept(dept.getName()); // 审批历史 + // TODO @lesan：打印的时候，未来节点打印么？ List approveNodes = new ArrayList<>(tasks.size()); tasks.forEach(item -> { Map taskLocalVariables = item.getTaskLocalVariables(); @@ -793,8 +795,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService }); printData.setApproveNodes(approveNodes); // 表单数据 + // TODO @lesan：这个可以在端上搞么？主要考虑，vben 和 vue3 plus 可能使用了不同的前端框架；可能直接使用 form-create 前端的工具方法，会更方便。 Map processVariables = historicProcessInstance.getProcessVariables(); - List formFields = new ArrayList<>(formFieldList.size()); + List formFields = new ArrayList<>(formFieldObjList.size()); formFieldObjList.forEach(item -> { BpmProcessPrintDataRespVO.FormField formField = new BpmProcessPrintDataRespVO.FormField(); formField.setFormName(item.getStr("title")); @@ -834,6 +837,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService Elements mention = document.getElementsByAttributeValue("data-w-e-type", "mention"); mention.forEach(item -> { String mentionId = JSONUtil.parseObj(URLUtil.decode(item.attr("data-info"))).getStr("id"); + // TODO @lesan：这里要求非空； item.html(printDataMap.get(mentionId)); }); // 替换流程记录 From e639dbfeb7bc8963fd34014e40138383ae63a3a6 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 3 Sep 2025 23:24:22 +0800 Subject: [PATCH 13/80] =?UTF-8?q?review=EF=BC=9A=E3=80=90iot=20=E7=89=A9?= =?UTF-8?q?=E8=81=94=E7=BD=91=E3=80=91=E5=9C=BA=E6=99=AF=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/IotSceneRuleTriggerTypeEnum.java | 1 - .../rule/scene/IotSceneRuleServiceImpl.java | 57 ++++++++++--------- .../IotAlertRecoverSceneRuleAction.java | 1 - .../IotAlertTriggerSceneRuleAction.java | 1 - .../scene/matcher/IotSceneRuleMatcher.java | 6 +- .../matcher/IotSceneRuleMatcherHelper.java | 6 +- .../matcher/IotSceneRuleMatcherManager.java | 19 +++---- .../CurrentTimeConditionMatcher.java | 5 +- .../DevicePropertyConditionMatcher.java | 4 +- .../DeviceStateConditionMatcher.java | 4 +- .../IotSceneRuleConditionMatcher.java | 9 +-- .../DeviceEventPostTriggerMatcher.java | 4 +- .../DevicePropertyPostTriggerMatcher.java | 4 +- .../DeviceServiceInvokeTriggerMatcher.java | 4 +- .../DeviceStateUpdateTriggerMatcher.java | 4 +- .../trigger/IotSceneRuleTriggerMatcher.java | 9 +-- .../matcher/trigger/TimerTriggerMatcher.java | 5 +- .../scene/timer/IotSceneRuleTimerHandler.java | 50 +++++----------- .../rule/scene/matcher/BaseMatcherTest.java | 1 + 19 files changed, 71 insertions(+), 123 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/rule/IotSceneRuleTriggerTypeEnum.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/rule/IotSceneRuleTriggerTypeEnum.java index bfc84c9f60..fac8ba6b80 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/rule/IotSceneRuleTriggerTypeEnum.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/rule/IotSceneRuleTriggerTypeEnum.java @@ -19,7 +19,6 @@ import java.util.Arrays; @Getter public enum IotSceneRuleTriggerTypeEnum implements ArrayValuable { - // TODO @芋艿：后续“对应”部分，要 @下，等包结构梳理完； /** * 设备上下线变更 * diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java index ee7351f717..c631e34586 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java @@ -84,13 +84,14 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { @Override public void updateSceneRuleStatus(Long id, Integer status) { - // 校验存在 + // 1. 校验存在 validateSceneRuleExists(id); - // 更新状态 + + // 2. 更新状态 IotSceneRuleDO updateObj = new IotSceneRuleDO().setId(id).setStatus(status); sceneRuleMapper.updateById(updateObj); - // 根据状态管理定时触发器 + // 3. 根据状态管理定时触发器 if (CommonStatusEnum.isEnable(status)) { // 启用时，获取完整的场景规则信息并注册定时触发器 IotSceneRuleDO sceneRule = sceneRuleMapper.selectById(id); @@ -105,12 +106,14 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { @Override public void deleteSceneRule(Long id) { - // 校验存在 + // 1. 校验存在 validateSceneRuleExists(id); - // 删除定时触发器 - timerHandler.unregisterTimerTriggers(id); - // 删除 + + // 2. 删除 sceneRuleMapper.deleteById(id); + + // 3. 删除定时触发器 + timerHandler.unregisterTimerTriggers(id); } private void validateSceneRuleExists(Long id) { @@ -146,16 +149,17 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { return sceneRuleMapper.selectListByStatus(status); } - // TODO 芋艿，缓存待实现 @puhui999 + // TODO @puhui999：缓存待实现 @Override @TenantIgnore // 忽略租户隔离：因为 IotSceneRuleMessageHandler 调用时，一般未传递租户，所以需要忽略 public List getSceneRuleListByProductIdAndDeviceIdFromCache(Long productId, Long deviceId) { + // 1. 查询启用状态的规则场景 + // TODO @puhui999：这里查询 enable 的； List list = sceneRuleMapper.selectList(); - // 只返回启用状态的规则场景 List enabledList = filterList(list, sceneRule -> CommonStatusEnum.isEnable(sceneRule.getStatus())); - // 根据 productKey 和 deviceName 进行匹配 + // 2. 根据 productKey 和 deviceName 进行匹配 return filterList(enabledList, sceneRule -> { if (CollUtil.isEmpty(sceneRule.getTriggers())) { return false; @@ -164,21 +168,19 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { for (IotSceneRuleDO.Trigger trigger : sceneRule.getTriggers()) { // 检查触发器是否匹配指定的产品和设备 try { - // 1. 检查产品是否匹配 - if (trigger.getProductId() == null) { - return false; - } - if (trigger.getDeviceId() == null) { + // 检查产品是否匹配 + if (trigger.getProductId() == null || trigger.getDeviceId() == null) { return false; } // 检查是否是全部设备的特殊标识 if (IotDeviceDO.DEVICE_ID_ALL.equals(trigger.getDeviceId())) { - return true; // 匹配所有设备 + return true; } // 检查具体设备 ID 是否匹配 return ObjUtil.equal(productId, trigger.getProductId()) && ObjUtil.equal(deviceId, trigger.getDeviceId()); } catch (Exception e) { - log.warn("[isMatchProductAndDevice][产品({}) 设备({}) 匹配触发器异常]", productId, deviceId, e); + log.warn("[getSceneRuleListByProductIdAndDeviceIdFromCache][产品({}) 设备({}) 匹配触发器异常]", + productId, deviceId, e); return false; } } @@ -188,7 +190,7 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { @Override public void executeSceneRuleByDevice(IotDeviceMessage message) { - // TODO @芋艿：这里的 tenantId，通过设备获取；@puhui999： + // TODO @puhui999：这里的 tenantId，通过设备获取； TenantUtils.execute(message.getTenantId(), () -> { // 1. 获得设备匹配的规则场景 List sceneRules = getMatchedSceneRuleListByMessage(message); @@ -234,7 +236,7 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { */ private List getMatchedSceneRuleListByMessage(IotDeviceMessage message) { // 1. 匹配设备 - // TODO @芋艿：可能需要 getSelf(); 缓存 @puhui999； + // TODO 缓存 @puhui999：可能需要 getSelf() // 1.1 通过 deviceId 获取设备信息 IotDeviceDO device = deviceService.getDeviceFromCache(message.getDeviceId()); if (device == null) { @@ -293,7 +295,6 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { */ private boolean matchSingleTrigger(IotDeviceMessage message, IotSceneRuleDO.Trigger trigger, IotSceneRuleDO sceneRule) { try { - // 2. 检查触发器的条件分组 return sceneRuleMatcherManager.isMatched(message, trigger) && isTriggerConditionGroupsMatched(message, trigger, sceneRule); } catch (Exception e) { log.error("[matchSingleTrigger][触发器匹配异常] sceneRuleId: {}, triggerType: {}, message: {}", @@ -310,18 +311,19 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { * @param sceneRule 场景规则（用于日志） * @return 是否匹配 */ - private boolean isTriggerConditionGroupsMatched(IotDeviceMessage message, IotSceneRuleDO.Trigger trigger, IotSceneRuleDO sceneRule) { - // 如果没有条件分组，则认为匹配成功（只依赖基础触发器匹配） + private boolean isTriggerConditionGroupsMatched(IotDeviceMessage message, + IotSceneRuleDO.Trigger trigger, + IotSceneRuleDO sceneRule) { + // 1. 如果没有条件分组，则认为匹配成功（只依赖基础触发器匹配） if (CollUtil.isEmpty(trigger.getConditionGroups())) { return true; } - // 检查条件分组：分组与分组之间是"或"的关系，条件与条件之间是"且"的关系 + // 2. 检查条件分组：分组与分组之间是"或"的关系，条件与条件之间是"且"的关系 for (List conditionGroup : trigger.getConditionGroups()) { if (CollUtil.isEmpty(conditionGroup)) { continue; } - // 检查当前分组中的所有条件是否都匹配（且关系） boolean allConditionsMatched = true; for (IotSceneRuleDO.TriggerCondition condition : conditionGroup) { @@ -330,14 +332,13 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { break; } } - // 如果当前分组的所有条件都匹配，则整个触发器匹配成功 if (allConditionsMatched) { return true; } } - // 所有分组都不匹配 + // 3. 所有分组都不匹配 return false; } @@ -372,13 +373,13 @@ public class IotSceneRuleServiceImpl implements IotSceneRuleService { sceneRules.forEach(sceneRule -> { // 2. 遍历规则场景的动作 sceneRule.getActions().forEach(actionConfig -> { - // 3.1 获取对应的动作 Action 数组 + // 2.1 获取对应的动作 Action 数组 List actions = filterList(sceneRuleActions, action -> action.getType().getType().equals(actionConfig.getType())); if (CollUtil.isEmpty(actions)) { return; } - // 3.2 执行动作 + // 2.2 执行动作 actions.forEach(action -> { try { action.execute(message, sceneRule, actionConfig); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertRecoverSceneRuleAction.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertRecoverSceneRuleAction.java index 851f3815fa..c2fe50c93a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertRecoverSceneRuleAction.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertRecoverSceneRuleAction.java @@ -14,7 +14,6 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; -// TODO @puhui999、@芋艿：未测试；需要场景联动开发完 /** * IoT 告警恢复的 {@link IotSceneRuleAction} 实现类 * diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java index 28223dbd6e..5ff4a61dd0 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.java @@ -17,7 +17,6 @@ import org.springframework.stereotype.Component; import javax.annotation.Nullable; import java.util.List; -// TODO @puhui999、@芋艿：未测试；需要场景联动开发完 /** * IoT 告警触发的 {@link IotSceneRuleAction} 实现类 * diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcher.java index 84795d9fe5..cf312bea6c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcher.java @@ -4,10 +4,8 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.condition.IotScene import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.trigger.IotSceneRuleTriggerMatcher; /** - * IoT 场景规则匹配器基础接口 - *

- * 定义所有匹配器的通用行为，包括优先级、名称和启用状态 - *

+ * IoT 场景规则匹配器基础接口：定义所有匹配器的通用行为，包括优先级、名称和启用状态 + * * - {@link IotSceneRuleTriggerMatcher} 触发器匹配器 * - {@link IotSceneRuleConditionMatcher} 条件匹配器 * diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java index db111e4472..937add3bbf 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java @@ -18,10 +18,8 @@ import java.util.Map; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList; /** - * IoT 场景规则匹配器工具类 - *

- * 提供通用的条件评估逻辑和工具方法，供触发器和条件匹配器使用 - *

+ * IoT 场景规则匹配器工具类：提供通用的条件评估逻辑和工具方法，供触发器和条件匹配器使用 + * * 该类包含了匹配器实现中常用的工具方法，如条件评估、参数校验、日志记录等 * * @author HUIHUI diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java index 3658fc07cd..ddca893c42 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java @@ -16,9 +16,7 @@ import java.util.function.Function; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; /** - * IoT 场景规则匹配器统一管理器 - *

- * 负责管理所有匹配器（触发器匹配器和条件匹配器），并提供统一的匹配入口 + * IoT 场景规则匹配器统一管理器：负责管理所有匹配器（触发器匹配器和条件匹配器），并提供统一的匹配入口 * * @author HUIHUI */ @@ -44,13 +42,12 @@ public class IotSceneRuleMatcherManager { return; } - // 按优先级排序并过滤启用的匹配器 + // 1.1 按优先级排序并过滤启用的匹配器 List allMatchers = matchers.stream() .filter(IotSceneRuleMatcher::isEnabled) .sorted(Comparator.comparing(IotSceneRuleMatcher::getPriority)) .toList(); - - // 分离触发器匹配器和条件匹配器 + // 1.2 分离触发器匹配器和条件匹配器 List triggerMatchers = allMatchers.stream() .filter(matcher -> matcher instanceof IotSceneRuleTriggerMatcher) .map(matcher -> (IotSceneRuleTriggerMatcher) matcher) @@ -60,7 +57,7 @@ public class IotSceneRuleMatcherManager { .map(matcher -> (IotSceneRuleConditionMatcher) matcher) .toList(); - // 构建触发器匹配器映射表 + // 2.1 构建触发器匹配器映射表 this.triggerMatchers = convertMap(triggerMatchers, IotSceneRuleTriggerMatcher::getSupportedTriggerType, Function.identity(), (existing, replacement) -> { @@ -70,7 +67,7 @@ public class IotSceneRuleMatcherManager { existing.getSupportedTriggerType() : replacement.getSupportedTriggerType()); return existing.getPriority() <= replacement.getPriority() ? existing : replacement; }, LinkedHashMap::new); - // 构建条件匹配器映射表 + // 2.2 构建条件匹配器映射表 this.conditionMatchers = convertMap(conditionMatchers, IotSceneRuleConditionMatcher::getSupportedConditionType, Function.identity(), (existing, replacement) -> { @@ -82,7 +79,7 @@ public class IotSceneRuleMatcherManager { }, LinkedHashMap::new); - // 日志输出初始化信息 + // 3. 日志输出初始化信息 log.info("[IotSceneRuleMatcherManager][初始化完成，共加载({})个匹配器，其中触发器匹配器({})个，条件匹配器({})个]", allMatchers.size(), this.triggerMatchers.size(), this.conditionMatchers.size()); this.triggerMatchers.forEach((type, matcher) -> @@ -135,7 +132,7 @@ public class IotSceneRuleMatcherManager { return false; } - // 根据条件类型查找对应的匹配器 + // 1. 根据条件类型查找对应的匹配器 IotSceneRuleConditionTypeEnum conditionType = IotSceneRuleConditionTypeEnum.typeOf(condition.getType()); if (conditionType == null) { log.warn("[isConditionMatched][conditionType({}) 未知的条件类型]", condition.getType()); @@ -147,7 +144,7 @@ public class IotSceneRuleMatcherManager { return false; } - // 执行匹配逻辑 + // 2. 执行匹配逻辑 try { return matcher.matches(message, condition); } catch (Exception e) { diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcher.java index 81c8fba597..cb85f36203 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/CurrentTimeConditionMatcher.java @@ -16,10 +16,9 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.List; +// TODO @puhui999：是不是 IoT 的前缀，都加下哈； /** - * 当前时间条件匹配器 - *

- * 处理时间相关的子条件匹配逻辑 + * 当前时间条件匹配器：处理时间相关的子条件匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java index d3120a81bc..f4316c0b5d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DevicePropertyConditionMatcher.java @@ -10,9 +10,7 @@ import org.springframework.stereotype.Component; /** - * 设备属性条件匹配器 - *

- * 处理设备属性相关的子条件匹配逻辑 + * 设备属性条件匹配器：处理设备属性相关的子条件匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java index 99000fd06b..ceb1ee8c8b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/DeviceStateConditionMatcher.java @@ -8,9 +8,7 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatche import org.springframework.stereotype.Component; /** - * 设备状态条件匹配器 - *

- * 处理设备状态相关的子条件匹配逻辑 + * 设备状态条件匹配器：处理设备状态相关的子条件匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotSceneRuleConditionMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotSceneRuleConditionMatcher.java index 875e8b1563..c9f720dfcb 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotSceneRuleConditionMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotSceneRuleConditionMatcher.java @@ -6,12 +6,9 @@ import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleConditionTypeEnum; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcher; /** - * IoT 场景规则条件匹配器接口 - *

- * 专门处理子条件的匹配逻辑，如设备状态、属性值、时间条件等 - *

- * 条件匹配器负责判断设备消息是否满足场景规则的附加条件， - * 在触发器匹配成功后进行进一步的条件筛选 + * IoT 场景规则条件匹配器接口：专门处理子条件的匹配逻辑，如设备状态、属性值、时间条件等 + * + * 条件匹配器负责判断设备消息是否满足场景规则的附加条件，在触发器匹配成功后进行进一步的条件筛选 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcher.java index 1ab1bb9d26..2a843d1c2c 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceEventPostTriggerMatcher.java @@ -10,9 +10,7 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatche import org.springframework.stereotype.Component; /** - * 设备事件上报触发器匹配器 - *

- * 处理设备事件上报的触发器匹配逻辑 + * 设备事件上报触发器匹配器：处理设备事件上报的触发器匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java index 0ee31a951e..fdaf68e3f1 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DevicePropertyPostTriggerMatcher.java @@ -9,9 +9,7 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatche import org.springframework.stereotype.Component; /** - * 设备属性上报触发器匹配器 - *

- * 处理设备属性数据上报的触发器匹配逻辑 + * 设备属性上报触发器匹配器：处理设备属性数据上报的触发器匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcher.java index e0caba2d37..2c357fb1e2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceServiceInvokeTriggerMatcher.java @@ -9,9 +9,7 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatche import org.springframework.stereotype.Component; /** - * 设备服务调用触发器匹配器 - *

- * 处理设备服务调用的触发器匹配逻辑 + * 设备服务调用触发器匹配器：处理设备服务调用的触发器匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java index f3a9f44cb0..b51716f4e3 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/DeviceStateUpdateTriggerMatcher.java @@ -9,9 +9,7 @@ import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatche import org.springframework.stereotype.Component; /** - * 设备状态更新触发器匹配器 - *

- * 处理设备上下线状态变更的触发器匹配逻辑 + * 设备状态更新触发器匹配器：处理设备上下线状态变更的触发器匹配逻辑 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotSceneRuleTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotSceneRuleTriggerMatcher.java index 89de00a686..84ea57958f 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotSceneRuleTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotSceneRuleTriggerMatcher.java @@ -6,12 +6,9 @@ import cn.iocoder.yudao.module.iot.enums.rule.IotSceneRuleTriggerTypeEnum; import cn.iocoder.yudao.module.iot.service.rule.scene.matcher.IotSceneRuleMatcher; /** - * IoT 场景规则触发器匹配器接口 - *

- * 专门处理主触发条件的匹配逻辑，如设备消息类型、定时器等 - *

- * 触发器匹配器负责判断设备消息是否满足场景规则的主触发条件， - * 是场景规则执行的第一道门槛 + * IoT 场景规则触发器匹配器接口：专门处理主触发条件的匹配逻辑，如设备消息类型、定时器等 + * + * 触发器匹配器负责判断设备消息是否满足场景规则的主触发条件，是场景规则执行的第一道门槛 * * @author HUIHUI */ diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcher.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcher.java index 794f8d6ae6..34cc59507d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcher.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/TimerTriggerMatcher.java @@ -9,9 +9,8 @@ import org.quartz.CronExpression; import org.springframework.stereotype.Component; /** - * 定时触发器匹配器 - *

- * 处理定时触发的触发器匹配逻辑 + * 定时触发器匹配器：处理定时触发的触发器匹配逻辑 + * * 注意：定时触发器不依赖设备消息，主要用于定时任务场景 * * @author HUIHUI diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java index ddb6367506..00a076494d 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/timer/IotSceneRuleTimerHandler.java @@ -18,9 +18,7 @@ import java.util.List; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList; /** - * IoT 场景规则定时触发器处理器 - *

- * 负责管理定时触发器的注册、更新、删除等操作 + * IoT 场景规则定时触发器处理器：负责管理定时触发器的注册、更新、删除等操作 * * @author HUIHUI */ @@ -37,19 +35,17 @@ public class IotSceneRuleTimerHandler { * @param sceneRule 场景规则 */ public void registerTimerTriggers(IotSceneRuleDO sceneRule) { + // 1. 过滤出定时触发器 if (sceneRule == null || CollUtil.isEmpty(sceneRule.getTriggers())) { return; } - - // 过滤出定时触发器 List timerTriggers = filterList(sceneRule.getTriggers(), trigger -> ObjUtil.equals(trigger.getType(), IotSceneRuleTriggerTypeEnum.TIMER.getType())); - if (CollUtil.isEmpty(timerTriggers)) { return; } - // 注册每个定时触发器 + // 2. 注册每个定时触发器 timerTriggers.forEach(trigger -> registerSingleTimerTrigger(sceneRule, trigger)); } @@ -63,23 +59,23 @@ public class IotSceneRuleTimerHandler { return; } - // 先删除旧的定时任务 + // 1. 先删除旧的定时任务 unregisterTimerTriggers(sceneRule.getId()); - // 如果场景规则已禁用，则不重新注册 + // 2.1 如果场景规则已禁用，则不重新注册 if (CommonStatusEnum.isDisable(sceneRule.getStatus())) { log.info("[updateTimerTriggers][场景规则({}) 已禁用，不注册定时触发器]", sceneRule.getId()); return; } - // 重新注册定时触发器 + // 2.2 重新注册定时触发器 registerTimerTriggers(sceneRule); } /** * 注销场景规则的定时触发器 * - * @param sceneRuleId 场景规则ID + * @param sceneRuleId 场景规则 ID */ public void unregisterTimerTriggers(Long sceneRuleId) { if (sceneRuleId == null) { @@ -98,7 +94,7 @@ public class IotSceneRuleTimerHandler { /** * 暂停场景规则的定时触发器 * - * @param sceneRuleId 场景规则ID + * @param sceneRuleId 场景规则 ID */ public void pauseTimerTriggers(Long sceneRuleId) { if (sceneRuleId == null) { @@ -114,25 +110,6 @@ public class IotSceneRuleTimerHandler { } } - /** - * 恢复场景规则的定时触发器 - * - * @param sceneRuleId 场景规则ID - */ - public void resumeTimerTriggers(Long sceneRuleId) { - if (sceneRuleId == null) { - return; - } - - String jobName = buildJobName(sceneRuleId); - try { - schedulerManager.resumeJob(jobName); - log.info("[resumeTimerTriggers][场景规则({}) 定时触发器恢复成功]", sceneRuleId); - } catch (SchedulerException e) { - log.error("[resumeTimerTriggers][场景规则({}) 定时触发器恢复失败]", sceneRuleId, e); - } - } - /** * 注册单个定时触发器 * @@ -146,18 +123,16 @@ public class IotSceneRuleTimerHandler { return; } - // 2. 构建任务名称和数据 - String jobName = buildJobName(sceneRule.getId()); - try { - // 3. 注册定时任务 + // 2.1 构建任务名称和数据 + String jobName = buildJobName(sceneRule.getId()); + // 2.2 注册定时任务 schedulerManager.addOrUpdateJob( IotSceneRuleJob.class, jobName, trigger.getCronExpression(), IotSceneRuleJob.buildJobDataMap(sceneRule.getId()) ); - log.info("[registerSingleTimerTrigger][场景规则({}) 定时触发器注册成功，CRON: {}]", sceneRule.getId(), trigger.getCronExpression()); } catch (SchedulerException e) { @@ -169,10 +144,11 @@ public class IotSceneRuleTimerHandler { /** * 构建任务名称 * - * @param sceneRuleId 场景规则ID + * @param sceneRuleId 场景规则 ID * @return 任务名称 */ private String buildJobName(Long sceneRuleId) { return "iot_scene_rule_timer_" + sceneRuleId; } + } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java index d73c926efa..b53e48da3a 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/BaseMatcherTest.java @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +// TODO @puhui999：建议改成 IotBaseConditionMatcherTest /** * Matcher 测试基类 * 提供通用的 Spring 测试配置 From a8223738db55f846c622b882b10fd0eb72fe1435 Mon Sep 17 00:00:00 2001 From: Lesan <1960681385@qq.com> Date: Thu, 4 Sep 2025 09:21:19 +0800 Subject: [PATCH 14/80] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instance/BpmProcessPrintDataRespVO.java | 33 ++--- .../task/BpmProcessInstanceServiceImpl.java | 132 ++++-------------- 2 files changed, 34 insertions(+), 131 deletions(-) diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java index a1a0047a00..700c68eb9b 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java @@ -1,11 +1,13 @@ package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance; +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; +import java.util.Map; -// TODO @lesan：这个可能复用 BpmApprovalDetailRespVO 哇？ +// TODO @lesan：这个可能复用 BpmApprovalDetailRespVO 哇？@芋艿：暂时先这样吧，BpmApprovalDetailRespVO 太大了。。。 @Schema(description = "管理后台 - 流程实例的打印数据 Response VO") @Data public class BpmProcessPrintDataRespVO { @@ -14,28 +16,26 @@ public class BpmProcessPrintDataRespVO { private Integer processStatus; - // TODO @lesan：通过字典？ - private String processStatusShow; - private String processInstanceId; private String processBusinessKey; private String processName; - // TODO @lesan：UserSimpleBaseVO 替代 startUser、startUserDept； - private String startUser; - - private String startUserDept; + private UserSimpleBaseVO startUser; private String startTime; + private String endTime; + private List approveNodes; - private List formFields; + private List formFields; private String printTemplateHtml; + private Map processVariables; + @Data public static class ApproveNode { @@ -49,19 +49,4 @@ public class BpmProcessPrintDataRespVO { } - @Data - public static class FormField { - - private String formId; - - private String formName; - - private String formType; - - private String formValue; - - private String formValueShow; - - } - } diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 7fedca1880..1fb4256a5f 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -3,12 +3,9 @@ package cn.iocoder.yudao.module.bpm.service.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.*; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.common.util.date.DateUtils; @@ -16,6 +13,7 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; import cn.iocoder.yudao.framework.common.util.object.PageUtils; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.iocoder.yudao.module.bpm.controller.admin.base.user.UserSimpleBaseVO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.BpmModelMetaInfoVO; import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*; @@ -61,10 +59,6 @@ import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.runtime.ProcessInstanceBuilder; import org.flowable.task.api.Task; import org.flowable.task.api.history.HistoricTaskInstance; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -736,19 +730,33 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @Override public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) { - // TODO 方法抽离 - // 流程实例 + // 1 数据准备 HistoricProcessInstance historicProcessInstance = getHistoricProcessInstance(processInstanceId); if (historicProcessInstance == null) { throw exception(PROCESS_INSTANCE_NOT_EXISTS); } - // 准备数据 BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService .getProcessDefinitionInfo(historicProcessInstance.getProcessDefinitionId()); BpmModelMetaInfoVO.PrintTemplateSetting printTemplateSetting = processDefinitionInfo.getPrintTemplateSetting(); - List formFieldList = processDefinitionInfo.getFormFields(); - List formFieldObjList = formFieldList != null ? formFieldList.stream().map(JSONUtil::parseObj).toList() - : ListUtil.of(); + // 2 获取打印所需数据 + BpmProcessPrintDataRespVO printData = new BpmProcessPrintDataRespVO(); + // 2.1 打印模板是否开启 + printData.setPrintTemplateEnable(printTemplateSetting != null && Boolean.TRUE.equals(printTemplateSetting.getEnable())); + // 2.2 流程相关数据 + printData.setProcessStatus(FlowableUtils.getProcessInstanceStatus(historicProcessInstance)); + printData.setProcessInstanceId(historicProcessInstance.getId()); + printData.setProcessName(historicProcessInstance.getName()); + printData.setProcessBusinessKey(historicProcessInstance.getBusinessKey()); + printData.setStartTime(DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(historicProcessInstance.getStartTime())); + printData.setEndTime(Objects.isNull(historicProcessInstance.getEndTime()) ? + "" : DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(historicProcessInstance.getEndTime())); + printData.setProcessVariables(historicProcessInstance.getProcessVariables()); + // 2.3 发起人 + AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(historicProcessInstance.getStartUserId())); + DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); + printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName())); + // 2.4 审批历史 + // TODO @lesan：打印的时候，未来节点打印么？ @芋艿：只打印已完成的任务 List tasks = historyService.createHistoricTaskInstanceQuery() .finished() .includeTaskLocalVariables() @@ -757,27 +765,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService BpmTaskStatusEnum.CANCEL.getStatus()) .orderByHistoricTaskInstanceStartTime().asc().list(); Set userIds = convertSet(tasks, item -> Long.valueOf(item.getAssignee())); - userIds.add(loginUserId); Map userMap = adminUserApi.getUserMap(userIds); - HashMap printDataMap = new HashMap<>(8 + formFieldObjList.size()); - // 返回打印所需数据 - BpmProcessPrintDataRespVO printData = new BpmProcessPrintDataRespVO(); - // 打印模板是否开启 - printData.setPrintTemplateEnable(printTemplateSetting != null && Boolean.TRUE.equals(printTemplateSetting.getEnable())); - // 流程相关数据 - printData.setProcessStatus(FlowableUtils.getProcessInstanceStatus(historicProcessInstance)); - printData.setProcessStatusShow(BpmProcessInstanceStatusEnum.valueOf(printData.getProcessStatus()).getDesc()); - printData.setProcessInstanceId(historicProcessInstance.getId()); - printData.setProcessName(historicProcessInstance.getName()); - printData.setProcessBusinessKey(historicProcessInstance.getBusinessKey()); - printData.setStartTime(DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(historicProcessInstance.getStartTime())); - // 发起人 - AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(historicProcessInstance.getStartUserId())); - DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); - printData.setStartUser(startUser.getNickname()); - printData.setStartUserDept(dept.getName()); - // 审批历史 - // TODO @lesan：打印的时候，未来节点打印么？ List approveNodes = new ArrayList<>(tasks.size()); tasks.forEach(item -> { Map taskLocalVariables = item.getTaskLocalVariables(); @@ -794,81 +782,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService approveNodes.add(approveNode); }); printData.setApproveNodes(approveNodes); - // 表单数据 - // TODO @lesan：这个可以在端上搞么？主要考虑，vben 和 vue3 plus 可能使用了不同的前端框架；可能直接使用 form-create 前端的工具方法，会更方便。 - Map processVariables = historicProcessInstance.getProcessVariables(); - List formFields = new ArrayList<>(formFieldObjList.size()); - formFieldObjList.forEach(item -> { - BpmProcessPrintDataRespVO.FormField formField = new BpmProcessPrintDataRespVO.FormField(); - formField.setFormName(item.getStr("title")); - formField.setFormType(item.getStr("type")); - formField.setFormId(item.getStr("field")); - formField.setFormValue(processVariables.getOrDefault(item.getStr("field"), "").toString()); - // TODO 根据不同类型的表单展示，下面为图片和输入框示例 - if (formField.getFormType().equals("input")) { - formField.setFormValueShow(processVariables.getOrDefault(item.getStr("field"), "").toString()); - } else if (formField.getFormType().equals("UploadImg")) { - formField.setFormValueShow(""); - } else { - formField.setFormValueShow("此类型表单展示未完善"); - } - printDataMap.put(formField.getFormId(), formField.getFormValueShow()); - formFields.add(formField); - }); - printData.setFormFields(formFields); - // 数据映射 - printDataMap.put("processName", printData.getProcessName()); - printDataMap.put("printUsername", userMap.get(loginUserId).getNickname()); - printDataMap.put("processNum", printData.getProcessInstanceId()); - printDataMap.put("printTime", DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(new DateTime())); - printDataMap.put("startUser", printData.getStartUser()); - printDataMap.put("startTime", printData.getStartTime()); - printDataMap.put("startUserDept", printData.getStartUserDept()); - printDataMap.put("processStatus", printData.getProcessStatusShow()); - // 自定义模板 + // 2.5 表单数据 + printData.setFormFields(processDefinitionInfo.getFormFields()); + // 2.6 自定义模板 if (printData.getPrintTemplateEnable() && printTemplateSetting != null) { - Document document = Jsoup.parse(printTemplateSetting.getTemplate()); - // 添加table的border - Elements tables = document.select("table"); - tables.forEach(item -> { - item.attr("border", "1"); - }); - // 替换所有mention - Elements mention = document.getElementsByAttributeValue("data-w-e-type", "mention"); - mention.forEach(item -> { - String mentionId = JSONUtil.parseObj(URLUtil.decode(item.attr("data-info"))).getStr("id"); - // TODO @lesan：这里要求非空； - item.html(printDataMap.get(mentionId)); - }); - // 替换流程记录 - Elements processRecords = document.getElementsByAttributeValue("data-w-e-type", "process-record"); - Element processRecordElement = null; - if (!processRecords.isEmpty()) { - processRecordElement = new Element("table", "") - .attr("style", "width:100%;") - .attr("border", "1"); - Element tbody = new Element("tbody", ""); - Element rowHead = new Element("tr", ""); - rowHead.appendChild(new Element("td", "") - .attr("colspan", "2") - .attr("width", "auto") - .attr("style", "text-align: center;") - .html("流程节点")); - tbody.appendChild(rowHead); - for (BpmProcessPrintDataRespVO.ApproveNode item : printData.getApproveNodes()) { - Element row = new Element("tr", ""); - row.appendChild(new Element("td", "") - .html(item.getNodeName())); - row.appendChild(new Element("td", "") - .html(item.getNodeDesc())); - tbody.appendChild(row); - } - processRecordElement.appendChild(tbody); - } - for (Element item : processRecords) { - item.html(processRecordElement.outerHtml()); - } - printData.setPrintTemplateHtml(document.html()); + printData.setPrintTemplateHtml(printTemplateSetting.getTemplate()); } return printData; } From 1c508add9235c1f0b7b8fb567ba69cb8c36d2595 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 4 Sep 2025 22:53:16 +0800 Subject: [PATCH 15/80] =?UTF-8?q?review=EF=BC=9A=E3=80=90bpm=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81=E3=80=91=E6=B5=81=E7=A8=8B=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/task/vo/instance/BpmProcessPrintDataRespVO.java | 4 +++- .../bpm/service/task/BpmProcessInstanceServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java index 700c68eb9b..5e21ae6a52 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java @@ -7,13 +7,13 @@ import lombok.Data; import java.util.List; import java.util.Map; -// TODO @lesan：这个可能复用 BpmApprovalDetailRespVO 哇？@芋艿：暂时先这样吧，BpmApprovalDetailRespVO 太大了。。。 @Schema(description = "管理后台 - 流程实例的打印数据 Response VO") @Data public class BpmProcessPrintDataRespVO { private Boolean printTemplateEnable; + // TODO @lesan：要不 processStatus、processInstanceId、processBusinessKey、processBusinessKey、startUser、endTime、processVariables 使用 BpmProcessInstanceRespVO ？虽然这个 VO 大了点，但是收一收字段。嘿嘿；进而只有 processInstance、tasks、formFields、printTemplateHtml 这些字段； private Integer processStatus; private String processInstanceId; @@ -28,6 +28,7 @@ public class BpmProcessPrintDataRespVO { private String endTime; + // TODO @lesan：变量要不改成 tasks； private List approveNodes; private List formFields; @@ -36,6 +37,7 @@ public class BpmProcessPrintDataRespVO { private Map processVariables; + // TODO @lesan：类名要不要改成 tasks ？然后 id、name、signUrl、description；感觉理解成本低点； @Data public static class ApproveNode { diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java index 1fb4256a5f..78961a38bf 100644 --- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java +++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java @@ -728,6 +728,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService userMap, deptMap); } + // TODO @lesan：这个可以放在 controller + convert 哇？保证 Service 只尽量处理写逻辑； @Override public BpmProcessPrintDataRespVO getProcessInstancePrintData(Long loginUserId, String processInstanceId) { // 1 数据准备 @@ -756,7 +757,6 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService DeptRespDTO dept = deptApi.getDept(startUser.getDeptId()); printData.setStartUser(new UserSimpleBaseVO().setNickname(startUser.getNickname()).setDeptName(dept.getName())); // 2.4 审批历史 - // TODO @lesan：打印的时候，未来节点打印么？ @芋艿：只打印已完成的任务 List tasks = historyService.createHistoricTaskInstanceQuery() .finished() .includeTaskLocalVariables() From d7c621688cc1da618c82f39d09c034642f4e8abe Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 4 Sep 2025 23:08:03 +0800 Subject: [PATCH 16/80] =?UTF-8?q?fix=EF=BC=9A=E3=80=90infra=20=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=E3=80=91vben=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8Cparams=20=E6=9C=AA=E4=BC=A0=E9=80=92=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/codegen/vue3_vben5_antd/general/api/api.ts.vm | 2 +- .../main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm | 2 +- .../main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm | 2 +- .../main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm index 090b14845b..c3691a8b73 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/general/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm index 875cd6bb8f..682e5923ae 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm index 090b14845b..c3691a8b73 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/general/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm index 875cd6bb8f..682e5923ae 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm @@ -98,7 +98,7 @@ export function delete${simpleClassName}List(ids: number[]) { /** 导出${table.classComment} */ export function export${simpleClassName}(params: any) { - return requestClient.download('${baseURL}/export-excel', params); + return requestClient.download('${baseURL}/export-excel', { params }); } ## 特殊：主子表专属逻辑 From f29abe853db4563c6cb03866db79669e2002158a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 5 Sep 2025 01:05:41 +0800 Subject: [PATCH 17/80] =?UTF-8?q?reactor=EF=BC=9A=E3=80=90infra=20?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E3=80=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20vben5=20+=20element-plus=20=E7=9A=84=20schema=20=E6=A8=A1?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/codegen/CodegenFrontTypeEnum.java | 5 +- .../service/codegen/inner/CodegenEngine.java | 11 +- .../vue3_vben5_ele/schema/api/api.ts.vm | 50 +++++--- .../vue3_vben5_ele/schema/views/data.ts.vm | 18 ++- .../vue3_vben5_ele/schema/views/form.vue.vm | 71 +++++------ .../vue3_vben5_ele/schema/views/index.vue.vm | 118 ++++++++++-------- .../schema/views/modules/form_sub_erp.vue.vm | 9 +- .../views/modules/form_sub_normal.vue.vm | 15 +-- .../schema/views/modules/list_sub_erp.vue.vm | 13 +- 9 files changed, 170 insertions(+), 140 deletions(-) diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java index 0ff9e56a9c..7f55507e42 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/enums/codegen/CodegenFrontTypeEnum.java @@ -21,9 +21,8 @@ public enum CodegenFrontTypeEnum { VUE3_VBEN5_ANTD_SCHEMA(40), // Vue3 VBEN5 + ANTD + schema 模版 VUE3_VBEN5_ANTD_GENERAL(41), // Vue3 VBEN5 + ANTD 标准模版 - // TODO @puhui999：:50、51 会好点； - VUE3_VBEN5_EP_SCHEMA(42), // Vue3 VBEN5 + EP + schema 模版 - VUE3_VBEN5_EP_GENERAL(43), // Vue3 VBEN5 + EP 标准模版 + VUE3_VBEN5_EP_SCHEMA(50), // Vue3 VBEN5 + EP + schema 模版 + VUE3_VBEN5_EP_GENERAL(51), // Vue3 VBEN5 + EP 标准模版 ; /** diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java index a0ce062cdc..cf8e030945 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java @@ -343,7 +343,7 @@ public class CodegenEngine { filePath = formatFilePath(filePath, bindingMap); String content = templateEngine.getTemplate(vmPath).render(bindingMap); // 格式化代码 - content = prettyCode(content); + content = prettyCode(content, vmPath); result.put(filePath, content); } @@ -383,11 +383,14 @@ public class CodegenEngine { * 如果不处理，Vue 的 Pretty 格式校验可能会报错 * * @param content 格式化前的代码 + * @param vmPath 模板路径 * @return 格式化后的代码 */ - private String prettyCode(String content) { - // Vue 界面：去除字段后面多余的 , 逗号，解决前端的 Pretty 代码格式检查的报错 - content = content.replaceAll(",\n}", "\n}").replaceAll(",\n }", "\n }"); + private String prettyCode(String content, String vmPath) { + // Vue 界面：去除字段后面多余的 , 逗号，解决前端的 Pretty 代码格式检查的报错（需要排除 vben5） + if (!StrUtil.contains(vmPath, "vben5")) { + content = content.replaceAll(",\n}", "\n}").replaceAll(",\n }", "\n }"); + } // Vue 界面：去除多的 dateFormatter，只有一个的情况下，说明没使用到 if (StrUtil.count(content, "dateFormatter") == 1) { content = StrUtils.removeLineContains(content, "dateFormatter"); diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm index 682e5923ae..02f175da18 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/api/api.ts.vm @@ -1,10 +1,11 @@ +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") import type { PageParam, PageResult } from '@vben/request'; import type { Dayjs } from 'dayjs'; import { requestClient } from '#/api/request'; #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}") -export namespace ${simpleClassName}Api { +export namespace ${apiName} { ## 特殊：主子表专属逻辑 #foreach ($subTable in $subTables) #set ($index = $foreach.count - 1) @@ -60,27 +61,35 @@ export namespace ${simpleClassName}Api { #if ( $table.templateType != 2 ) /** 查询${table.classComment}分页 */ export function get${simpleClassName}Page(params: PageParam) { - return requestClient.get>('${baseURL}/page', { params }); + return requestClient.get>( + '${baseURL}/page', + { params }, + ); } #else /** 查询${table.classComment}列表 */ export function get${simpleClassName}List(params: any) { - return requestClient.get<${simpleClassName}Api.${simpleClassName}[]>('${baseURL}/list', { params }); + return requestClient.get<${apiName}.${simpleClassName}[]>( + '${baseURL}/list', + { params }, + ); } #end /** 查询${table.classComment}详情 */ export function get${simpleClassName}(id: number) { - return requestClient.get<${simpleClassName}Api.${simpleClassName}>(`${baseURL}/get?id=${id}`); + return requestClient.get<${apiName}.${simpleClassName}>( + `${baseURL}/get?id=${id}`, + ); } /** 新增${table.classComment} */ -export function create${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) { +export function create${simpleClassName}(data: ${apiName}.${simpleClassName}) { return requestClient.post('${baseURL}/create', data); } /** 修改${table.classComment} */ -export function update${simpleClassName}(data: ${simpleClassName}Api.${simpleClassName}) { +export function update${simpleClassName}(data: ${apiName}.${simpleClassName}) { return requestClient.put('${baseURL}/update', data); } @@ -92,7 +101,9 @@ export function delete${simpleClassName}(id: number) { #if ( $table.templateType != 2 && $deleteBatchEnable) /** 批量删除${table.classComment} */ export function delete${simpleClassName}List(ids: number[]) { - return requestClient.delete(`${baseURL}/delete-list?ids=${ids.join(',')}`) + return requestClient.delete( + `${baseURL}/delete-list?ids=${ids.join(',')}`, + ); } #end @@ -118,31 +129,38 @@ export function export${simpleClassName}(params: any) { #if ( $table.templateType == 11 ) /** 获得${subTable.classComment}分页 */ export function get${subSimpleClassName}Page(params: PageParam) { - return requestClient.get>(`${baseURL}/${subSimpleClassName_strikeCase}/page`, { params }); + return requestClient.get>( + `${baseURL}/${subSimpleClassName_strikeCase}/page`, + { params }, + ); } ## 情况二：非 MASTER_ERP 时，需要列表查询子表 #else #if ( $subTable.subJoinMany ) /** 获得${subTable.classComment}列表 */ export function get${subSimpleClassName}ListBy${SubJoinColumnName}(${subJoinColumn.javaField}: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}[]>(`${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); + return requestClient.get<${apiName}.${subSimpleClassName}[]>( + `${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`, + ); } #else /** 获得${subTable.classComment} */ export function get${subSimpleClassName}By${SubJoinColumnName}(${subJoinColumn.javaField}: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`); + return requestClient.get<${apiName}.${subSimpleClassName}>( + `${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=${${subJoinColumn.javaField}}`, + ); } #end #end ## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作 #if ( $table.templateType == 11 ) /** 新增${subTable.classComment} */ -export function create${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { +export function create${subSimpleClassName}(data: ${apiName}.${subSimpleClassName}) { return requestClient.post(`${baseURL}/${subSimpleClassName_strikeCase}/create`, data); } /** 修改${subTable.classComment} */ -export function update${subSimpleClassName}(data: ${simpleClassName}Api.${subSimpleClassName}) { +export function update${subSimpleClassName}(data: ${apiName}.${subSimpleClassName}) { return requestClient.put(`${baseURL}/${subSimpleClassName_strikeCase}/update`, data); } @@ -154,13 +172,17 @@ export function delete${subSimpleClassName}(id: number) { #if ($deleteBatchEnable) /** 批量删除${subTable.classComment} */ export function delete${subSimpleClassName}List(ids: number[]) { - return requestClient.delete(`${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`) + return requestClient.delete( + `${baseURL}/${subSimpleClassName_strikeCase}/delete-list?ids=${ids.join(',')}`, + ); } #end /** 获得${subTable.classComment} */ export function get${subSimpleClassName}(id: number) { - return requestClient.get<${simpleClassName}Api.${subSimpleClassName}>(`${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`); + return requestClient.get<${apiName}.${subSimpleClassName}>( + `${baseURL}/${subSimpleClassName_strikeCase}/get?id=${id}`, + ); } #end #end diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/data.ts.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/data.ts.vm index 6b3fd2b379..9b91cbe821 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/data.ts.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/data.ts.vm @@ -1,13 +1,9 @@ +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { ${simpleClassName}Api } from '#/api/${table.moduleName}/${table.businessName}'; +import type { ${apiName} } from '#/api/${table.moduleName}/${table.businessName}'; -import { z } from '#/adapter/form'; -import { - DICT_TYPE, - getDictOptions, - getRangePickerDefaultProps, -} from '#/utils'; +import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps, } from '#/utils'; #if(${table.templateType} == 2)## 树表需要导入这些 import { get${simpleClassName}List } from '#/api/${table.moduleName}/${table.businessName}'; import { handleTree } from '@vben/utils'; @@ -186,7 +182,7 @@ export function useGridFormSchema(): VbenFormSchema[] { } /** 列表的字段 */ -export function useGridColumns(): VxeTableGridOptions<${simpleClassName}Api.${simpleClassName}>['columns'] { +export function useGridColumns(): VxeTableGridOptions<${apiName}.${simpleClassName}>['columns'] { return [ #if ($table.templateType != 2 && $deleteBatchEnable) { type: 'checkbox', width: 40 }, @@ -389,7 +385,7 @@ export function use${subSimpleClassName}GridFormSchema(): VbenFormSchema[] { } /** 列表的字段 */ -export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${simpleClassName}Api.${subSimpleClassName}>['columns'] { +export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${apiName}.${subSimpleClassName}>['columns'] { return [ #if ($table.templateType != 2 && $deleteBatchEnable) { type: 'checkbox', width: 40 }, @@ -426,7 +422,7 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${sim #else #if ($subTable.subJoinMany) ## 一对多 /** 新增/修改列表的字段 */ - export function use${subSimpleClassName}GridEditColumns(): VxeTableGridOptions<${simpleClassName}Api.${subSimpleClassName}>['columns'] { + export function use${subSimpleClassName}GridEditColumns(): VxeTableGridOptions<${apiName}.${subSimpleClassName}>['columns'] { return [ #foreach($column in $subColumns) #if ($column.createOperation || $column.updateOperation) @@ -602,4 +598,4 @@ export function use${subSimpleClassName}GridColumns(): VxeTableGridOptions<${sim } #end #end -#end +#end \ No newline at end of file diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/form.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/form.vue.vm index dab7294b1e..2d8c4104e3 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/form.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/form.vue.vm @@ -1,8 +1,16 @@ +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") @@ -135,20 +136,20 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm index c29beb9aa9..53ac024855 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/index.vue.vm @@ -1,46 +1,57 @@ +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") @@ -198,7 +206,6 @@ const [Grid, gridApi] = useVbenVxeGrid({ - #if ($table.templateType == 11) ## erp情况 - + #foreach ($subTable in $subTables) #set ($index = $foreach.count - 1) #set ($subClassNameVar = $subClassNameVars.get($index)) #set ($subSimpleClassName = $subSimpleClassNames.get($index)) #set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index)) - + <${subSimpleClassName}List :${subJoinColumn_strikeCase}="select${simpleClassName}?.id" /> - + #end - + #end - + \ No newline at end of file diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/form_sub_erp.vue.vm index e41e1df323..232318a3ef 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/form_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_ele/schema/views/modules/form_sub_erp.vue.vm @@ -2,8 +2,9 @@ #set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex)) +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") @@ -135,8 +136,8 @@ const [Modal, modalApi] = useVbenModal({ diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm index 1e13de2e97..f67cf08512 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/index.vue.vm @@ -1,46 +1,57 @@ +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api") @@ -255,8 +257,8 @@ const [Grid, gridApi] = useVbenVxeGrid({ type: 'primary', danger: true, icon: ACTION_ICON.DELETE, - disabled: isEmpty(checkedIds), auth: ['${table.moduleName}:${simpleClassName_strikeCase}:delete'], + disabled: isEmpty(checkedIds), onClick: handleDeleteBatch, }, #end @@ -297,7 +299,6 @@ const [Grid, gridApi] = useVbenVxeGrid({ /> - #if ($table.templateType == 11) ## erp情况 @@ -314,4 +315,4 @@ const [Grid, gridApi] = useVbenVxeGrid({ #end - + \ No newline at end of file diff --git a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm index c71e0b46e0..74d97422c8 100644 --- a/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm +++ b/yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/views/modules/form_sub_erp.vue.vm @@ -2,8 +2,9 @@ #set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组 #set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段 #set ($subSimpleClassName = $subSimpleClassNames.get($subIndex)) +#set ($apiName = "${table.moduleName.substring(0,1).toUpperCase()}${table.moduleName.substring(1)}${simpleClassName}Api")