Bladeren bron

refa:迁移channel

荭琪枫 2 jaren geleden
bovenliggende
commit
8c0ae750e4

+ 13 - 0
iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtils.java

@@ -5,10 +5,12 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,6 +39,17 @@ public class JsonUtils {
         }
     }
 
+    public static <T> T parse(String json, Class<T> cls) {
+        if (StringUtils.isBlank(json)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(json, cls);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public static <T> T parseObject(String text, Class<T> clazz) {
         if (StringUtils.isEmpty(text)) {
             return null;

+ 15 - 2
iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java

@@ -20,6 +20,9 @@ import cc.iotkit.model.device.DeviceGroup;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.device.VirtualDevice;
 import cc.iotkit.model.notify.Channel;
+import cc.iotkit.model.notify.ChannelConfig;
+import cc.iotkit.model.notify.ChannelTemplate;
+import cc.iotkit.model.notify.NotifyMessage;
 import cc.iotkit.model.product.Category;
 import cc.iotkit.model.product.Product;
 import cc.iotkit.model.product.ProductModel;
@@ -89,14 +92,18 @@ public class ExampleDataInit implements SmartInitializingSingleton {
     private IDbStructureData dbStructureData;
     @Autowired
     private IChannelData iChannelData;
-
+    @Autowired
+    private IChannelConfigData iChannelConfigData;
+    @Autowired
+    private IChannelTemplateData iChannelTemplateData;
+    @Autowired
+    private INotifyMessageData iNotifyMessageData;
     @Autowired
     private ISysDeptData sysDeptData;
 
     @Autowired
     private ISysMenuData sysMenuData;
 
-
     @Autowired
     private ISysPostData sysPostData;
 
@@ -200,6 +207,12 @@ public class ExampleDataInit implements SmartInitializingSingleton {
                     });
                     initData("channel", iChannelData, new TypeReference<List<Channel>>() {
                     });
+                    initData("channelConfig", iChannelConfigData, new TypeReference<List<ChannelConfig>>() {
+                    });
+                    initData("channelTemplate", iChannelTemplateData, new TypeReference<List<ChannelTemplate>>() {
+                    });
+                    initData("notifyMessage", iNotifyMessageData, new TypeReference<List<NotifyMessage>>() {
+                    });
 
                     initSysData();