瀏覽代碼

add 场景联动 fixed固件升级记录

18339543638 4 年之前
父節點
當前提交
ff63f262b1

+ 6 - 0
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/DeviceFirmwareEntity.java

@@ -43,6 +43,12 @@ public class DeviceFirmwareEntity  extends GenericEntity<String> implements Reco
     @Schema(description = "产品id")
     private String productId;
 
+    @Comment("产品名称")
+    @Column(name = "product_name", length = 255)
+    @NotBlank(message = "产品名称不能为空", groups = CreateGroup.class)
+    @Schema(description = "产品名称")
+    private String productName;
+
     @Comment("固件名称")
     @Column(name = "name", length = 255)
     @Size(max = 255,message = "固件名称长度不得超过255个字符")

+ 4 - 2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/DeviceUpgradeHistoryEntity.java

@@ -37,10 +37,12 @@ import javax.validation.constraints.Size;
 @Table(name = "dev_firmware_upgrade_history",indexes = {
     @Index(name = "history_id", columnList = "device_id,task_id,firmware_id",unique = true),
 })
-@Builder
-//@NoArgsConstructor
+//@Builder
 public class DeviceUpgradeHistoryEntity extends GenericEntity<String> {
 
+    public DeviceUpgradeHistoryEntity() {
+    }
+
     @Override
     @GeneratedValue(generator = Generators.SNOW_FLAKE)
     @Pattern(regexp = "^[0-9a-zA-Z_\\-]+$", message = "ID只能由数字,字母,下划线和中划线组成", groups = CreateGroup.class)

+ 16 - 0
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/service/RuleSceneService.java

@@ -0,0 +1,16 @@
+package org.jetlinks.community.rule.engine.service;
+
+import org.hswebframework.web.crud.service.GenericReactiveCrudService;
+import org.jetlinks.community.rule.engine.entity.RuleSceneEntity;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author lifang
+ * @version 1.0.0
+ * @ClassName RuleSceneService.java
+ * @Description TODO
+ * @createTime 2021年09月16日 17:23:00
+ */
+@Service
+public class RuleSceneService extends GenericReactiveCrudService<RuleSceneEntity, String> {
+}

+ 26 - 0
jetlinks-manager/rule-engine-manager/src/main/java/org/jetlinks/community/rule/engine/web/RuleSceneController.java

@@ -0,0 +1,26 @@
+package org.jetlinks.community.rule.engine.web;
+
+import lombok.AllArgsConstructor;
+import org.hswebframework.web.authorization.annotation.Resource;
+import org.hswebframework.web.crud.service.ReactiveCrudService;
+import org.hswebframework.web.crud.web.reactive.ReactiveServiceCrudController;
+import org.jetlinks.community.rule.engine.entity.RuleSceneEntity;
+import org.jetlinks.community.rule.engine.service.RuleSceneService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("rule-engine/scene")
+@Resource(id = "rule-engine/scene", name = "规则引擎-场景联动")
+@AllArgsConstructor
+public class RuleSceneController implements ReactiveServiceCrudController<RuleSceneEntity, String> {
+
+
+    private final RuleSceneService sceneService;
+
+
+    @Override
+    public ReactiveCrudService<RuleSceneEntity, String> getService() {
+        return sceneService;
+    }
+
+}

+ 7 - 0
jetlinks-standalone/src/main/resources/application.yml

@@ -167,6 +167,13 @@ springdoc:
   swagger-ui:
     path: /swagger-ui.html
   group-configs:
+    - group: 固件升级相关接口
+      packages-to-scan:
+        - org.jetlinks.community.device.web
+      paths-to-exclude:
+        - /device-firmware/**
+        - /firmware/upgrade/task/**
+        - /firmware/upgrade/history/**
     - group: 设备管理相关接口
       packages-to-scan:
         - org.jetlinks.community.device