diff --git a/springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/subscribeCallback.java b/springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/subscribeCallback.java index 16c13b33..c8b81602 100644 --- a/springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/subscribeCallback.java +++ b/springboot/fastbee-gateway/gateway-boot/src/main/java/com/fastbee/gateway/boot/start/subscribeCallback.java @@ -5,9 +5,9 @@ import com.fastbee.common.enums.ServerType; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; -import com.fastbee.iot.ruleEngine.MsgContext; import com.fastbee.iot.ruleEngine.RuleProcess; import com.fastbee.mqttclient.IEmqxMessageProducer; +import com.fastbee.ruleEngine.context.MsgContext; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.IMqttMessageListener; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java b/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java index 29b20e5d..838b877d 100644 --- a/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java +++ b/springboot/fastbee-open-api/src/main/java/com/fastbee/data/controller/DeviceController.java @@ -1,12 +1,10 @@ package com.fastbee.data.controller; -import com.fastbee.common.annotation.Anonymous; import com.fastbee.common.annotation.Log; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; import com.fastbee.common.core.page.TableDataInfo; import com.fastbee.common.enums.BusinessType; -import com.fastbee.common.utils.gateway.mq.TopicsUtils; import com.fastbee.common.utils.poi.ExcelUtil; import com.fastbee.iot.domain.Device; import com.fastbee.iot.model.DeviceRelateUserInput; diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml b/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml new file mode 100644 index 00000000..2e4a162d --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + com.fastbee + fastbee-plugs + 3.8.5 + + + fastbee-ruleEngine + + + 8 + 8 + UTF-8 + + + + + com.yomahub + liteflow-core + ${liteflow.version} + + + + org.springframework + spring-context + + + + org.projectlombok + lombok + provided + + + + org.apache.commons + commons-text + ${commons.text.version} + + + + + diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/MainExecutorBuilder.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/MainExecutorBuilder.java new file mode 100644 index 00000000..c9e26579 --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/MainExecutorBuilder.java @@ -0,0 +1,20 @@ +package com.fastbee.ruleEngine.config; + +import com.yomahub.liteflow.thread.ExecutorBuilder; +import org.springframework.scheduling.concurrent.CustomizableThreadFactory; + +import java.util.concurrent.*; + +public class MainExecutorBuilder implements ExecutorBuilder { + private ThreadFactory springThreadFactory = new CustomizableThreadFactory("liteflow-main-"); + @Override + public ExecutorService buildExecutor() { + return new ThreadPoolExecutor( + 10, + 30, + 5, + TimeUnit.MINUTES, + new ArrayBlockingQueue(1000), + springThreadFactory); + } +} diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/WhenExecutorBuilder.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/WhenExecutorBuilder.java new file mode 100644 index 00000000..7c8f9c98 --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/config/WhenExecutorBuilder.java @@ -0,0 +1,20 @@ +package com.fastbee.ruleEngine.config; + +import com.yomahub.liteflow.thread.ExecutorBuilder; +import org.springframework.scheduling.concurrent.CustomizableThreadFactory; + +import java.util.concurrent.*; + +public class WhenExecutorBuilder implements ExecutorBuilder { + private ThreadFactory springThreadFactory = new CustomizableThreadFactory("liteflow-when-"); + @Override + public ExecutorService buildExecutor() { + return new ThreadPoolExecutor( + 10, + 30, + 5, + TimeUnit.MINUTES, + new ArrayBlockingQueue(1000), + springThreadFactory); + } +} diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/context/MsgContext.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/context/MsgContext.java new file mode 100644 index 00000000..be71802a --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/context/MsgContext.java @@ -0,0 +1,108 @@ +package com.fastbee.ruleEngine.context; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.yomahub.liteflow.exception.NullParamException; +import com.yomahub.liteflow.log.LFLoggerManager; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.text.StringSubstitutor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.concurrent.ConcurrentHashMap; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Slf4j +public class MsgContext { + + private static Logger logger = LoggerFactory.getLogger("script"); + + /** + * 消息主题 + */ + private String topic; + + /** + * 消息内容 + */ + private String payload; + /** + * 设备编号 + */ + private String serialNumber; + /** + * 产品id + */ + private Long productId; + /** + * 协议编码 + */ + private String protocolCode; + + private ConcurrentHashMap dataMap = new ConcurrentHashMap<>(); + + public void printlog(String var1, Object... var2) { + String requestId = LFLoggerManager.getRequestId(); + logger.info(StrUtil.isBlank(requestId) ? "" : StrUtil.format("[{}]:", new Object[]{LFLoggerManager.getRequestId()}) + var1, var2); + } + + private void putDataMap(String key, T t) { + if (this.dataMap == null) { + this.dataMap = new ConcurrentHashMap<>(); + } + if (ObjectUtil.isNull(t)) { + throw new NullParamException("data can't accept null param"); + } else { + this.dataMap.put(key, t); + } + } + + public boolean hasData(String key) { + if (this.dataMap == null) { + return false; + } + return this.dataMap.containsKey(key); + } + + public T getData(String key) { + if (this.dataMap == null) { + return null; + } + return (T) this.dataMap.get(key); + } + + public void setData(String key, T t) { + this.putDataMap(key, t); + } + + //"{ topic:${topic}, payload:${payload} }"; + // 自定义占位符，可在脚本中使用msgContext.setData("test":1); + // 然后通过${test}调用，可在输出侧http body和 sql语句中传入该值 + public String placeholders(String str) { + if (getData("topic") == null) { + setData("topic", getTopic()); + } + if (getData("payload") == null) { + setData("payload", getPayload()); + } + if (getData("serialNumber") == null) { + setData("serialNumber", getSerialNumber()); + } + if (getData("productId") == null) { + setData("productId", getProductId()); + } + if (getData("protocolCode") == null) { + setData("protocolCode", getProtocolCode()); + } + StringSubstitutor substitutor = new StringSubstitutor(this.dataMap); + return substitutor.replace(str); + } +} diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/FlowLogExecutor.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/FlowLogExecutor.java new file mode 100644 index 00000000..636b3498 --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/FlowLogExecutor.java @@ -0,0 +1,126 @@ +package com.fastbee.ruleEngine.core; + +import com.fastbee.ruleEngine.context.MsgContext; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.flow.LiteflowResponse; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.Objects; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +@Component +@Slf4j +public class FlowLogExecutor { + private static final Logger script_logger = LoggerFactory.getLogger("script"); + private static final Logger scene_logger = LoggerFactory.getLogger("scene"); + @Resource + private FlowExecutor flowExecutor; + + + public LiteflowResponse execute2Resp(String chainId, Object param, Object... contextBeanArray) { + printContextBean(contextBeanArray); + LiteflowResponse response = flowExecutor.execute2Resp(chainId, param, contextBeanArray); + printResponse(response); + return response; + } + + public LiteflowResponse execute2RespWithRid(String chainId, Object param, String requestId, Object... contextBeanArray) { + printContextBeanWithRid(requestId, contextBeanArray); + LiteflowResponse response = flowExecutor.execute2RespWithRid(chainId, param, requestId, contextBeanArray); + printResponseWithRid(requestId, response); + return response; + } + + public LiteflowResponse execute2Future(String chainId, Object param, Object... contextBeanArray) throws ExecutionException, InterruptedException { + printContextBean(contextBeanArray); + Future future = flowExecutor.execute2Future(chainId, param, contextBeanArray); + LiteflowResponse response = future.get(); + printResponse(response); + return response; + } + + public LiteflowResponse execute2FutureWithRid(String chainId, Object param, String requestId, Object... contextBeanArray) throws ExecutionException, InterruptedException { + printContextBeanWithRid(requestId, contextBeanArray); + Future future = flowExecutor.execute2FutureWithRid(chainId, param, requestId, contextBeanArray); + LiteflowResponse response = future.get(); + printResponseWithRid(requestId, response); + return response; + } + + public void printContextBean(Object... contextBeanArray) { + log.info("=====+>规则引擎执行前，上下文变量值"); + for (Object contextBean : contextBeanArray) { + log.info("上下文数值：{}", contextBean); + } + log.info("=====+>规则引擎正在执行......"); + } + + public void printContextBeanWithRid(String requestId, Object... contextBeanArray) { + Logger ruleLogger; + String[] parts = requestId.split("/"); + if (parts.length >= 2) { + if (Objects.equals(parts[0], "script")) { + ruleLogger = script_logger; + } else if (Objects.equals(parts[0], "scene")) { + ruleLogger = scene_logger; + } else { + ruleLogger = log; + } + ruleLogger.info("[{}]=====+>规则引擎执行前，上下文变量值", requestId); + for (Object contextBean : contextBeanArray) { + ruleLogger.info("[{}]=====+>上下文数值：{}", requestId, contextBean); + } + ruleLogger.info("[{}]=====+>规则引擎正在执行......", requestId); + } + } + + public void printResponse(LiteflowResponse response) { + if (!response.isSuccess()) { + Exception e = response.getCause(); + log.error("=====+>报错信息：{}", e.getMessage(), e); + } else { + //步骤详情 +// Map> stepMap = response.getExecuteSteps(); +// stepMap.forEach((k, v) -> { +// v.forEach((step) -> { +// log.info("步骤：{}({})，执行时间：{}", step.getNodeId(), step.getNodeName(), step.getTimeSpent()); +// }); +// }); + //每各步骤执行时间 + String stepStr = response.getExecuteStepStrWithTime(); + log.info("=====+>步骤：{}", stepStr); + } + } + + public void printResponseWithRid(String requestId, LiteflowResponse response) { + Logger ruleLogger; + String[] parts = requestId.split("/"); + if (parts.length >= 2) { + if (Objects.equals(parts[0], "script")) { + ruleLogger = script_logger; + MsgContext msgContext = response.getContextBean(MsgContext.class); + if (msgContext != null) { + ruleLogger.info("[{}]=====+>执行后，msgContext：{}", requestId, msgContext); + } + } else if (Objects.equals(parts[0], "scene")) { + ruleLogger = scene_logger; + } else { + ruleLogger = log; + } + if (!response.isSuccess()) { + Exception e = response.getCause(); + ruleLogger.error("[{}]=====+>报错信息：{}", requestId, e.toString()); + } else { + //每各步骤执行时间 + String stepStr = response.getExecuteStepStrWithTime(); + ruleLogger.info("[{}]=====+>步骤：{}", requestId, stepStr); + ruleLogger.info("[{}]=====+>执行完成！", requestId); + } + } + } +} diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/RequestIdBuilder.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/RequestIdBuilder.java new file mode 100644 index 00000000..7794673c --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/core/RequestIdBuilder.java @@ -0,0 +1,29 @@ +package com.fastbee.ruleEngine.core; + + +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; +import com.fastbee.ruleEngine.util.Constant; + +public class RequestIdBuilder { + public static String buildSnowflakeRequestId() { + Snowflake snowflake = IdUtil.createSnowflake(1, 1); + return Constant.REQUEST_ID_SNOWFLAKE_PREFIX + snowflake.nextId(); + } + + public static String buildDeviceRequestId(String serialNumber) { + return Constant.REQUEST_ID_PREFIX + serialNumber; + } + + public static String buildSceneRequestId(String sceneId) { + return Constant.REQUEST_ID_PREFIX + sceneId; + } + + public static String buildProductRequestId(Long product, String serialNumber) { + return Constant.REQUEST_ID_PREFIX + product + Constant.REQUEST_ID_SPLIT + serialNumber; + } + + public static String buildALLRequestId(String serialNumber, String product, String sceneId) { + return Constant.REQUEST_ID_PREFIX + product + Constant.REQUEST_ID_SPLIT + serialNumber + Constant.REQUEST_ID_SPLIT + sceneId; + } +} diff --git a/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/util/Constant.java b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/util/Constant.java new file mode 100644 index 00000000..6d04e182 --- /dev/null +++ b/springboot/fastbee-plugs/fastbee-ruleEngine/src/main/java/com/fastbee/ruleEngine/util/Constant.java @@ -0,0 +1,11 @@ +package com.fastbee.ruleEngine.util; + +public class Constant { + public static final String REQUEST_ID_SNOWFLAKE_PREFIX = "S"; + public static final String REQUEST_ID_PREFIX = "R"; + public static final String REQUEST_ID_SPLIT = "_"; + // D=数据流，A=执行动作，T=触发器 + public static final String SCRIPT_DATA_PREFIX = "D"; + public static final String SCRIPT_ACTION_PREFIX = "A"; + public static final String SCRIPT_T_PREFIX = "T"; +} diff --git a/springboot/fastbee-plugs/pom.xml b/springboot/fastbee-plugs/pom.xml index 6b307974..a2bb4c2e 100644 --- a/springboot/fastbee-plugs/pom.xml +++ b/springboot/fastbee-plugs/pom.xml @@ -17,6 +17,7 @@ fastbee-generator fastbee-http fastbee-mqtt-client + fastbee-ruleEngine diff --git a/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/MqttPublish.java b/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/MqttPublish.java index 5716d84f..359a6e6c 100644 --- a/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/MqttPublish.java +++ b/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/MqttPublish.java @@ -7,7 +7,6 @@ import com.fastbee.common.enums.ServerType; import com.fastbee.common.utils.DateUtils; import com.fastbee.common.utils.StringUtils; import com.fastbee.common.utils.gateway.mq.TopicsUtils; -import com.fastbee.iot.ruleEngine.MsgContext; import com.fastbee.iot.ruleEngine.RuleProcess; import com.fastbee.mq.redischannel.producer.MessageProducer; import com.fastbee.mq.service.IDeviceReportMessageService; @@ -20,6 +19,7 @@ import com.fastbee.mqtt.model.ClientMessage; import com.fastbee.mqtt.service.IMessageStore; import com.fastbee.base.session.Session; import com.fastbee.base.util.AttributeUtils; +import com.fastbee.ruleEngine.context.MsgContext; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.mqtt.*; diff --git a/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/service/impl/MqttMessagePublishImpl.java b/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/service/impl/MqttMessagePublishImpl.java index 606dbc14..21af383e 100644 --- a/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/service/impl/MqttMessagePublishImpl.java +++ b/springboot/fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/service/impl/MqttMessagePublishImpl.java @@ -28,7 +28,6 @@ import com.fastbee.iot.domain.FunctionLog; import com.fastbee.iot.domain.Product; import com.fastbee.iot.model.NtpModel; import com.fastbee.iot.model.ThingsModels.PropertyDto; -import com.fastbee.iot.ruleEngine.MsgContext; import com.fastbee.iot.ruleEngine.RuleProcess; import com.fastbee.iot.service.IDeviceService; import com.fastbee.iot.service.IFunctionLogService; @@ -42,6 +41,7 @@ import com.fastbee.mq.service.IMqttMessagePublish; import com.fastbee.mqtt.manager.MqttRemoteManager; import com.fastbee.mqtt.model.PushMessageBo; import com.fastbee.mqttclient.PubMqttClient; +import com.fastbee.ruleEngine.context.MsgContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/springboot/fastbee-service/fastbee-iot-service/pom.xml b/springboot/fastbee-service/fastbee-iot-service/pom.xml index 1f4b617c..b6b0399c 100644 --- a/springboot/fastbee-service/fastbee-iot-service/pom.xml +++ b/springboot/fastbee-service/fastbee-iot-service/pom.xml @@ -120,7 +120,10 @@ liteflow-script-groovy ${liteflow.version} - + + com.fastbee + fastbee-ruleEngine + diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/MsgContext.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/MsgContext.java deleted file mode 100644 index 1730318a..00000000 --- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/MsgContext.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.fastbee.iot.ruleEngine; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MsgContext { - - private static Logger logger = LoggerFactory.getLogger("script"); - - /** 消息主题 */ - private String topic; - - /** 消息内容 */ - private String payload; - - /** - * 设备编号 - */ - private String serialNumber; - /** - * 产品id - */ - private Long productId; - /** - * 协议编码 - */ - private String protocolCode; -} diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/RuleProcess.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/RuleProcess.java index 4f3efc76..0b1a4b6e 100644 --- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/RuleProcess.java +++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/RuleProcess.java @@ -7,8 +7,9 @@ import com.fastbee.iot.model.ProductCode; import com.fastbee.iot.model.ScriptCondition; import com.fastbee.iot.service.IProductService; import com.fastbee.iot.service.IScriptService; +import com.fastbee.ruleEngine.context.MsgContext; +import com.fastbee.ruleEngine.core.FlowLogExecutor; import com.yomahub.liteflow.builder.el.LiteFlowChainELBuilder; -import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.flow.LiteflowResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ import java.util.Objects; public class RuleProcess { @Resource - private FlowExecutor flowExecutor; + private FlowLogExecutor flowLogExecutor; @Resource private IScriptService scriptService; @Resource @@ -55,20 +56,29 @@ public class RuleProcess { scriptCondition.setScriptEvent(event); // 事件 1=设备上报 2=平台下发 3=设备上线 4=设备下线 scriptCondition.setScriptPurpose(1); // 脚本用途：数据流=1 String[] scriptIds = scriptService.selectRuleScriptIdArray(scriptCondition); - MsgContext context = new MsgContext(topic, payload, serialNumber, productCode.getProductId(), productCode.getProtocolCode()); + MsgContext context = MsgContext.builder() + .serialNumber(serialNumber) + .productId(productCode.getProductId()) + .protocolCode(productCode.getProtocolCode()) + .payload(payload) + .topic(topic) + .build(); //如果查询不到脚本，则认为是不用处理 if (Objects.isNull(scriptIds) || scriptIds.length == 0) { return new MsgContext(); } // 动态构造Chain和EL表达式 - String el = String.join(",", scriptIds); // THEN（a,b,c,d） - LiteFlowChainELBuilder.createChain().setChainName("dataChain").setEL("THEN(" + el + ")").build(); - // 执行规则脚本 - LiteflowResponse response = flowExecutor.execute2Resp("dataChain", null, context); - if (!response.isSuccess()) { - log.error("规则脚本执行发生错误：" + response.getMessage()); + for (String script : scriptIds) { + String eChainName = "dataChain_" + script; + String requestId = "script/" + script; + String el = "THEN(" + script + ")"; + LiteFlowChainELBuilder.createChain().setChainName(eChainName).setEL(el).build(); + // 执行规则脚本 + LiteflowResponse response = flowLogExecutor.execute2RespWithRid(eChainName, null, requestId, context); + if (!response.isSuccess()) { + log.error("规则脚本执行发生错误：" + response.getMessage()); + } } - return context; } diff --git a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/SceneServiceImpl.java b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/SceneServiceImpl.java index 5e8eda94..a4f400e3 100644 --- a/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/SceneServiceImpl.java +++ b/springboot/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/SceneServiceImpl.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/springboot/pom.xml b/springboot/pom.xml index 3c3c84e0..87bc4097 100644 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -46,6 +46,7 @@ 2.2.3 3.3.1 2.12.2 + 1.10.0 @@ -343,6 +344,12 @@ ${fastbee.version} + + com.fastbee + fastbee-ruleEngine + ${fastbee.version} + + org.mapstruct mapstruct