fixed 固件升级任务

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

@@ -110,7 +110,7 @@ public class DeviceUpgradeHistoryEntity extends GenericEntity<String> {
     private String errorReason;
 
     @Comment("任务名称")
-    @Column(name = "task_id", length = 255)
+    @Column(name = "task_name", length = 255)
     @NotBlank(message = "任务名称", groups = CreateGroup.class)
     @Schema(description = "任务名称")
     private String taskName;

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/enums/FirmwareUpgradeState.java

@@ -18,7 +18,8 @@ public enum  FirmwareUpgradeState implements EnumDict<String> {
     waiting("等待升级"),
     processing("升级中"),
     failed("升级失败"),
-    finished("升级完成");
+    success("升级完成"),
+    canceled("取消升级");
 
     private String text;
 

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

@@ -104,7 +104,7 @@ public class LocalFirmwareUpgradeHistoryService extends GenericReactiveCrudServi
                     .where(DeviceUpgradeHistoryEntity::getFirmwareId, firmwareId)
                     .where(DeviceUpgradeHistoryEntity::getVersion, version)
                     .in(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.processing,FirmwareUpgradeState.waiting)
-                    .set(DeviceUpgradeHistoryEntity::getProgress, message.getProgress())
+//                    .set(DeviceUpgradeHistoryEntity::getProgress, message.getProgress())
                     .set(DeviceUpgradeHistoryEntity::getLastUpdateTime,System.currentTimeMillis());
                 boolean complete = message.isComplete();
                 //更新是否结束
@@ -112,7 +112,7 @@ public class LocalFirmwareUpgradeHistoryService extends GenericReactiveCrudServi
                     //判断更新成功或者失败
                     boolean success = message.isSuccess();
                     if(success){
-                        upgrade.set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.finished)
+                        upgrade.set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.success)
                             .set(DeviceUpgradeHistoryEntity::getProgress, 100)
                             .set(DeviceUpgradeHistoryEntity::getErrorReason,null);
                     }else {
@@ -120,7 +120,8 @@ public class LocalFirmwareUpgradeHistoryService extends GenericReactiveCrudServi
                             .set(DeviceUpgradeHistoryEntity::getErrorReason,message.getErrorReason());
                     }
                 }else {
-                    upgrade.set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.processing);
+                    upgrade.set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.processing)
+                        .set(DeviceUpgradeHistoryEntity::getProgress, message.getProgress());
                 }
                 return upgrade.execute();
             }).doOnNext(progress->{
@@ -138,7 +139,7 @@ public class LocalFirmwareUpgradeHistoryService extends GenericReactiveCrudServi
                                 .where(DeviceUpgradeHistoryEntity::getFirmwareId, firmwareId)
                                 .where(DeviceUpgradeHistoryEntity::getVersion, version)
                                 .where(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.processing)
-                                .set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.failed)
+                                .set(DeviceUpgradeHistoryEntity::getState,FirmwareUpgradeState.canceled)
                                 .set(DeviceUpgradeHistoryEntity::getErrorReason,"升级超时")
                                 .set(DeviceUpgradeHistoryEntity::getProgress, message.getProgress())
                                 .set(DeviceUpgradeHistoryEntity::getLastUpdateTime,System.currentTimeMillis()).execute()

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/DeviceCategoryController.java

@@ -102,45 +102,4 @@ public class DeviceCategoryController implements
                 return Flux.fromIterable(TreeSupportEntity.list2tree(data, DeviceCategory::setChildren));
             });
     }
-
-    /*
-    static List<DeviceCategory> statics;
-
-    static void rebuild(String parentId, List<DeviceCategory> children) {
-        if (children == null) {
-            return;
-        }
-        for (DeviceCategory child : children) {
-            String id = child.getId();
-            child.setId(parentId + "|" + id + "|");
-            child.setParentId(parentId + "|");
-            rebuild(parentId + "|" + id, child.getChildren());
-        }
-    }
-
-    static {
-        try {
-            ClassPathResource resource = new ClassPathResource("device-category.json");
-            String json = StreamUtils.copyToString(resource.getInputStream(), StandardCharsets.UTF_8);
-
-            List<DeviceCategory> all = JSON.parseArray(json, DeviceCategory.class);
-
-            List<DeviceCategory> root = TreeSupportEntity.list2tree(all, DeviceCategory::setChildren);
-
-            for (DeviceCategory category : root) {
-                String id = category.getId();
-
-                category.setId("|" + id + "|");
-                category.setParentId("|" + category.getParentId() + "|");
-                rebuild("|" + id, category.getChildren());
-            }
-
-            statics = all;
-
-        } catch (Exception e) {
-            statics = new ArrayList<>();
-            log.error(e.getMessage(), e);
-        }
-    }
-     */
 }