Merge remote-tracking branch 'origin/2.0' into 2.0

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/DefaultDeviceConfigMetadataSupplier.java

@@ -1,6 +1,7 @@
 package org.jetlinks.community.device.service;
 
 import lombok.AllArgsConstructor;
+import org.hswebframework.web.exception.BusinessException;
 import org.jetlinks.community.device.entity.DeviceInstanceEntity;
 import org.jetlinks.community.device.entity.DeviceProductEntity;
 import org.jetlinks.community.device.spi.DeviceConfigMetadataSupplier;
@@ -94,8 +95,10 @@ public class DefaultDeviceConfigMetadataSupplier implements DeviceConfigMetadata
     private Flux<ConfigMetadata> getProductConfigMetadata0(String productId) {
         return productService
             .findById(productId)
+            .filter(product -> StringUtils.hasText(product.getMessageProtocol()))
             .flatMapMany(product -> protocolSupports
                 .getProtocol(product.getMessageProtocol())
+                .onErrorMap(e -> new BusinessException("error.unable_to_load_protocol_by_access_id", 404, product.getMessageProtocol()))
                 .flatMap(support -> support.getConfigMetadata(Transport.of(product.getTransportProtocol()))));
     }
 }

jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/web/RuleInstanceController.java

@@ -1,141 +0,0 @@
-package org.jetlinks.community.rule.engine.web;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-import org.hswebframework.web.api.crud.entity.PagerResult;
-import org.hswebframework.web.api.crud.entity.QueryOperation;
-import org.hswebframework.web.api.crud.entity.QueryParamEntity;
-import org.hswebframework.web.authorization.annotation.QueryAction;
-import org.hswebframework.web.authorization.annotation.Resource;
-import org.hswebframework.web.authorization.annotation.ResourceAction;
-import org.hswebframework.web.crud.service.ReactiveCrudService;
-import org.hswebframework.web.crud.web.reactive.ReactiveServiceCrudController;
-import org.hswebframework.web.exception.NotFoundException;
-import org.jetlinks.community.rule.engine.entity.RuleEngineExecuteEventInfo;
-import org.jetlinks.community.rule.engine.entity.RuleEngineExecuteLogInfo;
-import org.jetlinks.community.rule.engine.entity.RuleInstanceEntity;
-import org.jetlinks.community.rule.engine.service.RuleInstanceService;
-import org.jetlinks.rule.engine.api.RuleData;
-import org.jetlinks.rule.engine.api.RuleEngine;
-import org.jetlinks.rule.engine.api.model.RuleEngineModelParser;
-import org.jetlinks.rule.engine.api.task.Task;
-import org.jetlinks.rule.engine.api.task.TaskSnapshot;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-@RestController
-@RequestMapping("rule-engine/instance")
-@Resource(id = "rule-instance", name = "规则引擎-实例")
-@Tag(name = "规则实例")
-public class RuleInstanceController implements ReactiveServiceCrudController<RuleInstanceEntity, String> {
-
-    @Autowired
-    private RuleInstanceService instanceService;
-
-    @Autowired
-    private RuleEngine ruleEngine;
-
-    @Autowired
-    private RuleEngineModelParser modelParser;
-
-    //获取全部支持的执行器
-    @GetMapping("/{instanceId}/tasks")
-    @QueryAction
-    @Operation(summary = "获取执行中规则的任务信息")
-    public Flux<TaskSnapshot> getTasks(@PathVariable String instanceId) {
-        return ruleEngine
-            .getTasks(instanceId)
-            .flatMap(Task::dump);
-    }
-
-    /**
-     * 查看规则实例的节点
-     *
-     * @param instanceId 实例ID
-     * @return 节点信息
-     */
-    @GetMapping("/{instanceId}/nodes")
-    @QueryAction
-    @Operation(summary = "获取规则实例的节点信息")
-    public Flux<RuleNodeInfo> getRuleNodeList(@PathVariable String instanceId) {
-        return instanceService
-            .findById(instanceId)
-            .flatMapIterable(instance -> modelParser
-                .parse(instance.getModelType(), instance.getModelMeta())
-                .getNodes())
-            .map(model -> new RuleNodeInfo(model.getId(), StringUtils.hasLength(model.getName()) ? model.getName() : model.getExecutor()))
-            .onErrorResume(err -> Mono.empty());
-    }
-
-    @Getter
-    @Setter
-    @AllArgsConstructor
-    public static class RuleNodeInfo {
-        private String id;
-
-        private String name;
-    }
-
-    @PostMapping("/{id}/_start")
-    @ResourceAction(id = "start", name = "启动")
-    @Operation(summary = "启动规则")
-    public Mono<Boolean> start(@PathVariable String id) {
-        return instanceService.start(id)
-            .thenReturn(true);
-    }
-
-    @PostMapping("/{id}/_stop")
-    @ResourceAction(id = "stop", name = "停止")
-    @Operation(summary = "停止规则")
-    public Mono<Boolean> stop(@PathVariable String id) {
-        return instanceService.stop(id)
-            .thenReturn(true);
-    }
-
-
-    @GetMapping("/{id}/logs")
-    @QueryAction
-    @QueryOperation(summary = "查询规则日志")
-    public Mono<PagerResult<RuleEngineExecuteLogInfo>> queryLog(@PathVariable String id,
-                                                                @Parameter(hidden = true) QueryParamEntity paramEntity) {
-        return paramEntity.toQuery()
-            .is("instanceId", id)
-            .execute(instanceService::queryExecuteLog);
-    }
-
-    @GetMapping("/{id}/events")
-    @QueryAction
-    @QueryOperation(summary = "查询规则事件")
-    public Mono<PagerResult<RuleEngineExecuteEventInfo>> queryEvents(@PathVariable String id,
-                                                                     @Parameter(hidden = true) QueryParamEntity paramEntity) {
-        return paramEntity.toQuery()
-            .is("instanceId", id)
-            .execute(instanceService::queryExecuteEvent);
-
-    }
-
-    @PostMapping("/{id}/{taskId}/_execute")
-    @ResourceAction(id = "execute", name = "执行")
-    @QueryOperation(summary = "执行规则")
-    public Mono<Void> execute(@PathVariable @Parameter(description = "规则ID") String id,
-                              @PathVariable @Parameter(description = "任务ID") String taskId,
-                              @RequestBody @Parameter(description = "规则数据") Mono<RuleData> payload) {
-        return payload.flatMap(data -> ruleEngine
-            .getTasks(id)
-            .filter(task -> task.getId().equals(taskId))
-            .switchIfEmpty(Mono.error(NotFoundException::new))
-            .flatMap(task -> task.execute(data)).then());
-    }
-
-    @Override
-    public ReactiveCrudService<RuleInstanceEntity, String> getService() {
-        return instanceService;
-    }
-}