refactor:处理报错内容

iot-common/iot-common-core/pom.xml

@@ -26,6 +26,7 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
+        <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -47,18 +48,6 @@
             <artifactId>spring-context-support</artifactId>
         </dependency>
 
-        <!-- SpringWeb模块 -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- 自定义验证注解 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
         <!--常用工具类 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -86,11 +75,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.github.linpeilie</groupId>
             <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
@@ -106,6 +90,11 @@
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>

iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/LoginBody.java

@@ -1,9 +1,7 @@
 package cc.iotkit.common.undefined;
 
-import cc.iotkit.common.constant.UserConstants;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * 用户登录对象
@@ -24,14 +22,12 @@ public class LoginBody {
      * 用户名
      */
     @NotBlank(message = "{user.username.not.blank}")
-    @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
     private String username;
 
     /**
      * 用户密码
      */
     @NotBlank(message = "{user.password.not.blank}")
-    @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
     private String password;
 
     /**

iot-common/iot-common-core/src/main/java/cc/iotkit/common/undefined/UserOnlineDTO.java

@@ -3,7 +3,6 @@ package cc.iotkit.common.undefined;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -16,7 +15,6 @@ import java.io.Serializable;
 @NoArgsConstructor
 public class UserOnlineDTO implements Serializable {
 
-    @Serial
     private static final long serialVersionUID = 1L;
 
     /**

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/MapstructUtils.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import io.github.linpeilie.Converter;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.springframework.util.Assert;
 
 import java.util.List;
 import java.util.Map;
@@ -29,12 +30,8 @@ public class MapstructUtils {
      * @return desc
      */
     public static <T, V> V convert(T source, Class<V> desc) {
-        if (ObjectUtil.isNull(source)) {
+        Assert.notNull(source,"source is null");
-            return null;
+        Assert.notNull(desc,"desc is null");
-        }
-        if (ObjectUtil.isNull(desc)) {
-            return null;
-        }
         return CONVERTER.convert(source, desc);
     }
 

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ReflectUtils.java

@@ -0,0 +1,55 @@
+package cc.iotkit.common.utils;
+
+import cn.hutool.core.util.ReflectUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.lang.reflect.Method;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ *
+ * @author Lion Li
+ */
+@SuppressWarnings("rawtypes")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ReflectUtils extends ReflectUtil {
+
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName) {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, ".")) {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invoke(object, getterMethodName);
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++) {
+            if (i < names.length - 1) {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invoke(object, getterMethodName);
+            } else {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                Method method = getMethodByName(object.getClass(), setterMethodName);
+                invoke(object, method, value);
+            }
+        }
+    }
+
+}

iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ServletUtils.java

@@ -1,193 +0,0 @@
-package cc.iotkit.common.utils;
-
-import cn.hutool.core.convert.Convert;
-import cn.hutool.extra.servlet.JakartaServletUtil;
-import cn.hutool.http.HttpStatus;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.springframework.http.MediaType;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 客户端工具类
- *
- * @author ruoyi
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class ServletUtils extends JakartaServletUtil {
-
-    /**
-     * 获取String参数
-     */
-    public static String getParameter(String name) {
-        return getRequest().getParameter(name);
-    }
-
-    /**
-     * 获取String参数
-     */
-    public static String getParameter(String name, String defaultValue) {
-        return Convert.toStr(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获取Integer参数
-     */
-    public static Integer getParameterToInt(String name) {
-        return Convert.toInt(getRequest().getParameter(name));
-    }
-
-    /**
-     * 获取Integer参数
-     */
-    public static Integer getParameterToInt(String name, Integer defaultValue) {
-        return Convert.toInt(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获取Boolean参数
-     */
-    public static Boolean getParameterToBool(String name) {
-        return Convert.toBool(getRequest().getParameter(name));
-    }
-
-    /**
-     * 获取Boolean参数
-     */
-    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
-        return Convert.toBool(getRequest().getParameter(name), defaultValue);
-    }
-
-    /**
-     * 获得所有请求参数
-     *
-     * @param request 请求对象{@link ServletRequest}
-     * @return Map
-     */
-    public static Map<String, String[]> getParams(ServletRequest request) {
-        final Map<String, String[]> map = request.getParameterMap();
-        return Collections.unmodifiableMap(map);
-    }
-
-    /**
-     * 获得所有请求参数
-     *
-     * @param request 请求对象{@link ServletRequest}
-     * @return Map
-     */
-    public static Map<String, String> getParamMap(ServletRequest request) {
-        Map<String, String> params = new HashMap<>();
-        for (Map.Entry<String, String[]> entry : getParams(request).entrySet()) {
-            params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR));
-        }
-        return params;
-    }
-
-    /**
-     * 获取request
-     */
-    public static HttpServletRequest getRequest() {
-        return getRequestAttributes().getRequest();
-    }
-
-    /**
-     * 获取response
-     */
-    public static HttpServletResponse getResponse() {
-        return getRequestAttributes().getResponse();
-    }
-
-    /**
-     * 获取session
-     */
-    public static HttpSession getSession() {
-        return getRequest().getSession();
-    }
-
-    public static ServletRequestAttributes getRequestAttributes() {
-        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
-        return (ServletRequestAttributes) attributes;
-    }
-
-    /**
-     * 将字符串渲染到客户端
-     *
-     * @param response 渲染对象
-     * @param string   待渲染的字符串
-     */
-    public static void renderString(HttpServletResponse response, String string) {
-        try {
-            response.setStatus(HttpStatus.HTTP_OK);
-            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
-            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
-            response.getWriter().print(string);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 是否是Ajax异步请求
-     *
-     * @param request
-     */
-    public static boolean isAjaxRequest(HttpServletRequest request) {
-
-        String accept = request.getHeader("accept");
-        if (accept != null && accept.contains(MediaType.APPLICATION_JSON_VALUE)) {
-            return true;
-        }
-
-        String xRequestedWith = request.getHeader("X-Requested-With");
-        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
-            return true;
-        }
-
-        String uri = request.getRequestURI();
-        if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) {
-            return true;
-        }
-
-        String ajax = request.getParameter("__ajax");
-        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
-    }
-
-    public static String getClientIP() {
-        return getClientIP((HttpServletRequest)getRequest());
-    }
-
-    /**
-     * 内容编码
-     *
-     * @param str 内容
-     * @return 编码后的内容
-     */
-    public static String urlEncode(String str) {
-        return URLEncoder.encode(str, StandardCharsets.UTF_8);
-    }
-
-    /**
-     * 内容解码
-     *
-     * @param str 内容
-     * @return 解码后的内容
-     */
-    public static String urlDecode(String str) {
-        return URLDecoder.decode(str, StandardCharsets.UTF_8);
-    }
-
-}

iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java

@@ -30,9 +30,13 @@ public class ProtocolConverter implements Owned<String> {
 
     private Long createAt;
 
-    // 脚本类型
+    /**
+     * 脚本类型
+     */
     private String typ;
 
-    // 脚本内容
+    /**
+     * 脚本内容
+     */
     private String script;
 }

iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java

@@ -91,11 +91,6 @@ public class SysMenu extends BaseEntity implements Id<Long>,Serializable {
      */
     private String icon;
 
-    /**
-     * 创建部门
-     */
-    private SysDept createDept;
-
     /**
      * 备注
      */

iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java

@@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
 public class SysUserPost extends BaseEntity implements Id<Long>, Serializable {
     private static final long serialVersionUID = 1L;
 
+    private Long id;
 
     /**
      * 用户ID

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/CategoryDataCache.java

@@ -44,6 +44,11 @@ public class CategoryDataCache implements ICategoryData {
         categoryData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return categoryData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoDataCache.java

@@ -235,6 +235,11 @@ public class DeviceInfoDataCache implements IDeviceInfoData, SmartInitializingSi
         putSubDeviceIds(device.getParentId());
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return deviceInfoData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/DeviceInfoPropertyDataCache.java

@@ -52,6 +52,11 @@ public class DeviceInfoPropertyDataCache implements IDeviceInfoData {
         deviceInfoData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return deviceInfoData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/OauthClientDataCache.java

@@ -59,6 +59,11 @@ public class OauthClientDataCache implements IOauthClientData {
         oauthClientData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return oauthClientData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ProductDataCache.java

@@ -67,6 +67,11 @@ public class ProductDataCache implements IProductData {
         productCacheEvict.findById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return productData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ProductModelDataCache.java

@@ -54,6 +54,11 @@ public class ProductModelDataCache implements IProductModelData {
         productModelData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return productModelData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/SpaceDataCache.java

@@ -74,6 +74,11 @@ public class SpaceDataCache implements ISpaceData {
         spaceData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return spaceData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/ThingModelDataCache.java

@@ -44,6 +44,11 @@ public class ThingModelDataCache implements IThingModelData {
         thingModelData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return thingModelData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-cache/src/main/java/cc/iotkit/data/service/UserInfoDataCache.java

@@ -60,6 +60,11 @@ public class UserInfoDataCache implements IUserInfoData {
         userInfoData.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return userInfoData.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/AlertConfigDataImpl.java

@@ -1,9 +1,9 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IAlertConfigData;
 import cc.iotkit.data.dao.AlertConfigRepository;
-import cc.iotkit.data.convert.AlertConfigMapper;
 import cc.iotkit.data.model.TbAlertConfig;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.alert.AlertConfig;
@@ -35,7 +35,7 @@ public class AlertConfigDataImpl implements IAlertConfigData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        alertConfigRepository.save(AlertConfigMapper.M.toVo(data));
+        alertConfigRepository.save(MapstructUtils.convert(data, TbAlertConfig.class));
         return data;
     }
 
@@ -49,6 +49,11 @@ public class AlertConfigDataImpl implements IAlertConfigData {
         alertConfigRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return 0;
@@ -66,9 +71,7 @@ public class AlertConfigDataImpl implements IAlertConfigData {
 
     @Override
     public Paging<AlertConfig> selectAlertConfigPage(PageRequest<AlertConfig> request) {
-        //Pageable pageable = org.springframework.data.domain.PageRequest.of(request.getPageNo(), request.getPageSize());
+        Page<TbAlertConfig> alertConfigPage = alertConfigRepository.findAll(Pageable.ofSize(request.getPageSize()).withPage(request.getPageNum() - 1));
-        //Page<TbAlertConfig> alertConfigPage =  alertConfigRepository.findAll(Example.of(AlertConfigMapper.M.toVo(request.getData())), pageable);
+        return new Paging<>(alertConfigPage.getTotalElements(), MapstructUtils.convert(alertConfigPage.getContent(), AlertConfig.class));
-        Page<TbAlertConfig> alertConfigPage =  alertConfigRepository.findAll(Pageable.ofSize(request.getPageSize()).withPage(request.getPageNo() - 1));
-        return new Paging<>(alertConfigPage.getTotalElements(), AlertConfigMapper.toDto(alertConfigPage.getContent()));
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/AlertRecordDataImpl.java

@@ -1,9 +1,9 @@
 package cc.iotkit.data.service;
 
 import cc.iotkit.common.api.PageRequest;
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IAlertRecordData;
 import cc.iotkit.data.dao.AlertRecordRepository;
-import cc.iotkit.data.convert.AlertRecordMapper;
 import cc.iotkit.data.model.TbAlertRecord;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.alert.AlertRecord;
@@ -20,51 +20,56 @@ import org.springframework.stereotype.Service;
 @Service
 public class AlertRecordDataImpl implements IAlertRecordData {
 
-  @Autowired
+    @Autowired
-  private AlertRecordRepository alertRecordRepository;
+    private AlertRecordRepository alertRecordRepository;
 
 
-  @Override
+    @Override
-  public AlertRecord findById(String s) {
+    public AlertRecord findById(String s) {
-    return null;
+        return null;
-  }
+    }
 
-  @Override
+    @Override
-  public AlertRecord save(AlertRecord data) {
+    public AlertRecord save(AlertRecord data) {
-    return null;
+        return null;
-  }
+    }
 
-  @Override
+    @Override
-  public AlertRecord add(AlertRecord data) {
+    public AlertRecord add(AlertRecord data) {
-    return null;
+        return null;
-  }
+    }
 
-  @Override
+    @Override
-  public void deleteById(String s) {
+    public void deleteById(String s) {
 
-  }
+    }
 
-  @Override
+    @Override
-  public long count() {
+    public void deleteByIds(String[] strings) {
-    return 0;
-  }
 
-  @Override
+    }
-  public List<AlertRecord> findAll() {
-    return null;
-  }
 
-  @Override
+    @Override
-  public Paging<AlertRecord> findAll(int page, int size) {
+    public long count() {
-    return null;
+        return 0;
-  }
+    }
+
+    @Override
+    public List<AlertRecord> findAll() {
+        return null;
+    }
+
+    @Override
+    public Paging<AlertRecord> findAll(int page, int size) {
+        return null;
+    }
 
 
-  @Override
+    @Override
-  public Paging<AlertRecord> selectAlertConfigPage(PageRequest<AlertRecord> request) {
+    public Paging<AlertRecord> selectAlertConfigPage(PageRequest<AlertRecord> request) {
-   // Pageable pageable = org.springframework.data.domain.PageRequest.of(request.getPageNo(),request.getPageSize(), Sort.Direction.DESC, "alartTime");
+        Page<TbAlertRecord> alertRecordPage = alertRecordRepository.findAll(Pageable.ofSize(request.getPageSize())
-    Page<TbAlertRecord> alertRecordPage = alertRecordRepository.findAll(Pageable.ofSize(request.getPageSize()).withPage(request.getPageNo() - 1));
+                .withPage(request.getPageNum() - 1));
-    return new Paging<>(alertRecordPage.getTotalElements(),
+        return new Paging<>(alertRecordPage.getTotalElements(),
-        AlertRecordMapper.toDto(alertRecordPage.getContent()));
+                MapstructUtils.convert(alertRecordPage.getContent(), AlertRecord.class));
-  }
+    }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/CategoryDataImpl.java

@@ -9,9 +9,9 @@
  */
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.dao.CategoryRepository;
-import cc.iotkit.data.convert.CategoryMapper;
 import cc.iotkit.data.model.TbCategory;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.Category;
@@ -32,19 +32,19 @@ public class CategoryDataImpl implements ICategoryData {
 
     @Override
     public Category findById(String s) {
-        return CategoryMapper.M.toDto(categoryRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(categoryRepository.findById(s).orElse(null), Category.class);
     }
 
     @Override
     public Category save(Category data) {
-        TbCategory tb = categoryRepository.save(CategoryMapper.M.toVo(data));
+        TbCategory tb = categoryRepository.save(MapstructUtils.convert(data, TbCategory.class));
         data.setId(tb.getId());
         return data;
     }
 
     @Override
     public Category add(Category data) {
-        TbCategory tb = categoryRepository.save(CategoryMapper.M.toVo(data));
+        TbCategory tb = categoryRepository.save(MapstructUtils.convert(data, TbCategory.class));
         data.setId(tb.getId());
         return data;
     }
@@ -54,6 +54,11 @@ public class CategoryDataImpl implements ICategoryData {
         categoryRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return categoryRepository.count();
@@ -62,16 +67,17 @@ public class CategoryDataImpl implements ICategoryData {
     @Override
     public List<Category> findAll() {
         return categoryRepository.findAll().stream()
-                .map(CategoryMapper.M::toDto).collect(Collectors.toList());
+                .map(c -> MapstructUtils.convert(c, Category.class))
+                .collect(Collectors.toList());
     }
 
     @Override
     public Paging<Category> findAll(int page, int size) {
         return new Paging<>(
                 categoryRepository.count(),
-                categoryRepository.findAll(Pageable.ofSize(size).withPage(page - 1))
+                MapstructUtils.convert(categoryRepository.findAll(
-                        .stream().map(CategoryMapper.M::toDto).collect(Collectors.toList())
+                        Pageable.ofSize(size).withPage(page - 1)).getContent(),
-        );
+                        Category.class));
     }
 
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelConfigDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelConfigData;
 import cc.iotkit.data.dao.ChannelConfigRepository;
-import cc.iotkit.data.convert.ChannelConfigMapper;
 import cc.iotkit.data.model.TbChannelConfig;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.notify.ChannelConfig;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 /**
  * author: 石恒
@@ -31,7 +30,7 @@ public class ChannelConfigDataImpl implements IChannelConfigData {
 
     @Override
     public ChannelConfig findById(String id) {
-        return ChannelConfigMapper.M.toDto(channelConfigRepository.findById(id).orElse(null));
+        return MapstructUtils.convert(channelConfigRepository.findById(id).orElse(null), ChannelConfig.class);
     }
 
     @Override
@@ -39,7 +38,7 @@ public class ChannelConfigDataImpl implements IChannelConfigData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        channelConfigRepository.save(ChannelConfigMapper.M.toVo(data));
+        channelConfigRepository.save(MapstructUtils.convert(data, TbChannelConfig.class));
         return data;
     }
 
@@ -54,6 +53,11 @@ public class ChannelConfigDataImpl implements IChannelConfigData {
         channelConfigRepository.deleteById(id);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return channelConfigRepository.count();
@@ -61,8 +65,7 @@ public class ChannelConfigDataImpl implements IChannelConfigData {
 
     @Override
     public List<ChannelConfig> findAll() {
-        return channelConfigRepository.findAll().stream().map(ChannelConfigMapper.M::toDto)
+        return MapstructUtils.convert(channelConfigRepository.findAll(), ChannelConfig.class);
-                .collect(Collectors.toList());
     }
 
     @Override
@@ -70,9 +73,6 @@ public class ChannelConfigDataImpl implements IChannelConfigData {
         Page<TbChannelConfig> tbDeviceConfigs = channelConfigRepository.findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(
                 tbDeviceConfigs.getTotalElements(),
-                tbDeviceConfigs.getContent()
+                MapstructUtils.convert(tbDeviceConfigs.getContent(), ChannelConfig.class));
-                        .stream().map(ChannelConfigMapper.M::toDto)
-                        .collect(Collectors.toList())
-        );
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelData;
 import cc.iotkit.data.dao.ChannelRepository;
-import cc.iotkit.data.convert.ChannelMapper;
 import cc.iotkit.data.model.TbChannel;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.notify.Channel;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 /**
  * author: 石恒
@@ -31,7 +30,7 @@ public class ChannelDataImpl implements IChannelData {
 
     @Override
     public Channel findById(String id) {
-        return ChannelMapper.M.toDto(channelRepository.findById(id).orElse(null));
+        return MapstructUtils.convert(channelRepository.findById(id).orElse(null), Channel.class);
     }
 
     @Override
@@ -39,7 +38,9 @@ public class ChannelDataImpl implements IChannelData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        channelRepository.save(ChannelMapper.M.toVo(data));
+        channelRepository.save(
+                MapstructUtils.convert(data, TbChannel.class)
+        );
         return data;
     }
 
@@ -54,6 +55,11 @@ public class ChannelDataImpl implements IChannelData {
         channelRepository.deleteById(id);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return channelRepository.count();
@@ -61,8 +67,7 @@ public class ChannelDataImpl implements IChannelData {
 
     @Override
     public List<Channel> findAll() {
-        return channelRepository.findAll().stream().map(ChannelMapper.M::toDto)
+        return MapstructUtils.convert(channelRepository.findAll(), Channel.class);
-                .collect(Collectors.toList());
     }
 
     @Override
@@ -70,9 +75,6 @@ public class ChannelDataImpl implements IChannelData {
         Page<TbChannel> tbDeviceConfigs = channelRepository.findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(
                 tbDeviceConfigs.getTotalElements(),
-                tbDeviceConfigs.getContent()
+                MapstructUtils.convert(tbDeviceConfigs.getContent(), Channel.class));
-                        .stream().map(ChannelMapper.M::toDto)
-                        .collect(Collectors.toList())
-        );
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ChannelTemplateDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IChannelTemplateData;
 import cc.iotkit.data.dao.ChannelTemplateRepository;
-import cc.iotkit.data.convert.ChannelTemplateMapper;
 import cc.iotkit.data.model.TbChannelTemplate;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.notify.ChannelTemplate;
@@ -31,7 +31,7 @@ public class ChannelTemplateDataImpl implements IChannelTemplateData {
 
     @Override
     public ChannelTemplate findById(String id) {
-        return ChannelTemplateMapper.M.toDto(channelTemplateRepository.findById(id).orElse(null));
+        return MapstructUtils.convert(channelTemplateRepository.findById(id).orElse(null), ChannelTemplate.class);
     }
 
     @Override
@@ -39,7 +39,7 @@ public class ChannelTemplateDataImpl implements IChannelTemplateData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        channelTemplateRepository.save(ChannelTemplateMapper.M.toVo(data));
+        channelTemplateRepository.save(MapstructUtils.convert(data, TbChannelTemplate.class));
         return data;
     }
 
@@ -54,6 +54,11 @@ public class ChannelTemplateDataImpl implements IChannelTemplateData {
         channelTemplateRepository.deleteById(id);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return channelTemplateRepository.count();
@@ -61,7 +66,8 @@ public class ChannelTemplateDataImpl implements IChannelTemplateData {
 
     @Override
     public List<ChannelTemplate> findAll() {
-        return channelTemplateRepository.findAll().stream().map(ChannelTemplateMapper.M::toDto)
+        return channelTemplateRepository.findAll().stream()
+                .map(c -> MapstructUtils.convert(c, ChannelTemplate.class))
                 .collect(Collectors.toList());
     }
 
@@ -70,9 +76,6 @@ public class ChannelTemplateDataImpl implements IChannelTemplateData {
         Page<TbChannelTemplate> tbDeviceConfigs = channelTemplateRepository.findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(
                 tbDeviceConfigs.getTotalElements(),
-                tbDeviceConfigs.getContent()
+                MapstructUtils.convert(tbDeviceConfigs.getContent(), ChannelTemplate.class));
-                        .stream().map(ChannelTemplateMapper.M::toDto)
-                        .collect(Collectors.toList())
-        );
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/CommonService.java

@@ -46,6 +46,11 @@ public class CommonService<VO extends Id<T>, T> implements ICommonData<VO, T> {
         repository.deleteById(id);
     }
 
+    @Override
+    public void deleteByIds(T[] ts) {
+
+    }
+
     @Override
     public long count() {
         return repository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceConfigDataImpl.java

@@ -9,9 +9,9 @@
  */
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IDeviceConfigData;
 import cc.iotkit.data.dao.DeviceConfigRepository;
-import cc.iotkit.data.convert.DeviceConfigMapper;
 import cc.iotkit.data.model.TbDeviceConfig;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.DeviceConfig;
@@ -24,7 +24,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Primary
 @Service
@@ -35,17 +34,17 @@ public class DeviceConfigDataImpl implements IDeviceConfigData {
 
     @Override
     public DeviceConfig findByProductKeyAndDeviceName(String productKey, String deviceName) {
-        return DeviceConfigMapper.M.toDto(deviceConfigRepository.findByProductKeyAndDeviceName(productKey, deviceName));
+        return MapstructUtils.convert(deviceConfigRepository.findByProductKeyAndDeviceName(productKey, deviceName), DeviceConfig.class);
     }
 
     @Override
     public DeviceConfig findByDeviceId(String deviceId) {
-        return DeviceConfigMapper.M.toDto(deviceConfigRepository.findByDeviceId(deviceId));
+        return MapstructUtils.convert(deviceConfigRepository.findByDeviceId(deviceId), DeviceConfig.class);
     }
 
     @Override
     public DeviceConfig findById(String s) {
-        return DeviceConfigMapper.M.toDto(deviceConfigRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(deviceConfigRepository.findById(s).orElse(null), DeviceConfig.class);
     }
 
     @Override
@@ -53,7 +52,7 @@ public class DeviceConfigDataImpl implements IDeviceConfigData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        deviceConfigRepository.save(DeviceConfigMapper.M.toVo(data));
+        deviceConfigRepository.save(MapstructUtils.convert(data, TbDeviceConfig.class));
         return data;
     }
 
@@ -67,6 +66,11 @@ public class DeviceConfigDataImpl implements IDeviceConfigData {
         deviceConfigRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return deviceConfigRepository.count();
@@ -74,8 +78,7 @@ public class DeviceConfigDataImpl implements IDeviceConfigData {
 
     @Override
     public List<DeviceConfig> findAll() {
-        return deviceConfigRepository.findAll().stream().map(DeviceConfigMapper.M::toDto)
+        return MapstructUtils.convert(deviceConfigRepository.findAll(), DeviceConfig.class);
-                .collect(Collectors.toList());
     }
 
     @Override
@@ -83,9 +86,6 @@ public class DeviceConfigDataImpl implements IDeviceConfigData {
         Page<TbDeviceConfig> tbDeviceConfigs = deviceConfigRepository.findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(
                 tbDeviceConfigs.getTotalElements(),
-                tbDeviceConfigs.getContent()
+                MapstructUtils.convert(tbDeviceConfigs.getContent(), DeviceConfig.class));
-                        .stream().map(DeviceConfigMapper.M::toDto)
-                        .collect(Collectors.toList())
-        );
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceGroupDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IDeviceGroupData;
 import cc.iotkit.data.dao.DeviceGroupRepository;
-import cc.iotkit.data.convert.DeviceGroupMapper;
 import cc.iotkit.data.model.TbDeviceGroup;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.DeviceGroup;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 @Primary
 @Service
@@ -28,14 +27,13 @@ public class DeviceGroupDataImpl implements IDeviceGroupData {
     public Paging<DeviceGroup> findByNameLike(String name, int page, int size) {
         Page<TbDeviceGroup> groups = deviceGroupRepository.findByNameLike("%" + name.trim() + "%",
                 Pageable.ofSize(size).withPage(page - 1));
-        return new Paging<>(groups.getTotalElements(), groups.getContent()
+        return new Paging<>(groups.getTotalElements(),
-                .stream().map(DeviceGroupMapper.M::toDto)
+                MapstructUtils.convert(groups.getContent(), DeviceGroup.class));
-                .collect(Collectors.toList()));
     }
 
     @Override
     public DeviceGroup findById(String s) {
-        return DeviceGroupMapper.M.toDto(deviceGroupRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(deviceGroupRepository.findById(s).orElse(null), DeviceGroup.class);
     }
 
     @Override
@@ -43,7 +41,7 @@ public class DeviceGroupDataImpl implements IDeviceGroupData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        deviceGroupRepository.save(DeviceGroupMapper.M.toVo(data));
+        deviceGroupRepository.save(MapstructUtils.convert(data, TbDeviceGroup.class));
         return data;
     }
 
@@ -58,6 +56,11 @@ public class DeviceGroupDataImpl implements IDeviceGroupData {
         deviceGroupRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return deviceGroupRepository.count();
@@ -65,16 +68,12 @@ public class DeviceGroupDataImpl implements IDeviceGroupData {
 
     @Override
     public List<DeviceGroup> findAll() {
-        return deviceGroupRepository.findAll()
+        return MapstructUtils.convert(deviceGroupRepository.findAll(), DeviceGroup.class);
-                .stream().map(DeviceGroupMapper.M::toDto)
-                .collect(Collectors.toList());
     }
 
     @Override
     public Paging<DeviceGroup> findAll(int page, int size) {
         Page<TbDeviceGroup> groups = deviceGroupRepository.findAll(Pageable.ofSize(size).withPage(page - 1));
-        return new Paging<>(groups.getTotalElements(), groups.getContent()
+        return new Paging<>(groups.getTotalElements(), MapstructUtils.convert(groups.getContent(), DeviceGroup.class));
-                .stream().map(DeviceGroupMapper.M::toDto)
-                .collect(Collectors.toList()));
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/DeviceInfoDataImpl.java

@@ -4,9 +4,9 @@ import cc.iotkit.common.utils.ReflectUtil;
 import cc.iotkit.data.manager.ICategoryData;
 import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.manager.IProductData;
-import cc.iotkit.data.convert.DeviceInfoMapper;
 import cc.iotkit.data.dao.*;
 import cc.iotkit.data.model.*;
+import cc.iotkit.data.service.convert.DeviceInfoMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.DeviceInfo;
 import cc.iotkit.model.product.Category;
@@ -474,6 +474,11 @@ public class DeviceInfoDataImpl implements IDeviceInfoData {
         deviceInfoRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return deviceInfoRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/HomeDataImpl.java

@@ -1,8 +1,9 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IHomeData;
 import cc.iotkit.data.dao.HomeRepository;
-import cc.iotkit.data.convert.HomeMapper;
+import cc.iotkit.data.model.TbHome;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.space.Home;
 import org.apache.commons.lang3.StringUtils;
@@ -22,17 +23,17 @@ public class HomeDataImpl implements IHomeData {
 
     @Override
     public Home findByUidAndCurrent(String uid, boolean current) {
-        return HomeMapper.M.toDto(homeRepository.findByUidAndCurrent(uid, current));
+        return MapstructUtils.convert(homeRepository.findByUidAndCurrent(uid, current), Home.class);
     }
 
     @Override
     public Home findByUidAndId(String uid, String id) {
-        return HomeMapper.M.toDto(homeRepository.findByUidAndId(uid, id));
+        return MapstructUtils.convert(homeRepository.findByUidAndId(uid, id), Home.class);
     }
 
     @Override
     public List<Home> findByUid(String uid) {
-        return HomeMapper.toDto(homeRepository.findByUid(uid));
+        return MapstructUtils.convert(homeRepository.findByUid(uid), Home.class);
     }
 
     @Override
@@ -47,7 +48,7 @@ public class HomeDataImpl implements IHomeData {
 
     @Override
     public Home findById(String s) {
-        return HomeMapper.M.toDto(homeRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(homeRepository.findById(s).orElse(null), Home.class);
     }
 
     @Override
@@ -55,7 +56,7 @@ public class HomeDataImpl implements IHomeData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        homeRepository.save(HomeMapper.M.toVo(data));
+        homeRepository.save(MapstructUtils.convert(data, TbHome.class));
         return data;
     }
 
@@ -69,6 +70,11 @@ public class HomeDataImpl implements IHomeData {
         homeRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return homeRepository.count();
@@ -76,7 +82,7 @@ public class HomeDataImpl implements IHomeData {
 
     @Override
     public List<Home> findAll() {
-        return HomeMapper.toDto(homeRepository.findAll());
+        return MapstructUtils.convert(homeRepository.findAll(), Home.class);
     }
 
     @Override

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/OauthClientDataImpl.java

@@ -9,9 +9,10 @@
  */
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IOauthClientData;
 import cc.iotkit.data.dao.OauthClientRepository;
-import cc.iotkit.data.convert.OauthClientMapper;
+import cc.iotkit.data.model.TbOauthClient;
 import cc.iotkit.model.OauthClient;
 import cc.iotkit.model.Paging;
 import org.apache.commons.lang3.StringUtils;
@@ -32,12 +33,12 @@ public class OauthClientDataImpl implements IOauthClientData {
 
     @Override
     public OauthClient findByClientId(String clientId) {
-        return OauthClientMapper.M.toDto(oauthClientRepository.findByClientId(clientId));
+        return MapstructUtils.convert(oauthClientRepository.findByClientId(clientId), OauthClient.class);
     }
 
     @Override
     public OauthClient findById(String s) {
-        return OauthClientMapper.M.toDto(oauthClientRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(oauthClientRepository.findById(s).orElse(null), OauthClient.class);
     }
 
     @Override
@@ -46,7 +47,7 @@ public class OauthClientDataImpl implements IOauthClientData {
             data.setId(UUID.randomUUID().toString());
             data.setCreateAt(System.currentTimeMillis());
         }
-        oauthClientRepository.save(OauthClientMapper.M.toVo(data));
+        oauthClientRepository.save(MapstructUtils.convert(data, TbOauthClient.class));
         return data;
     }
 
@@ -60,6 +61,11 @@ public class OauthClientDataImpl implements IOauthClientData {
         oauthClientRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return oauthClientRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProductData;
 import cc.iotkit.data.dao.ProductRepository;
-import cc.iotkit.data.convert.ProductMapper;
 import cc.iotkit.data.model.TbProduct;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.Product;
@@ -24,12 +24,12 @@ public class ProductDataImpl implements IProductData {
 
     @Override
     public List<Product> findByCategory(String category) {
-        return ProductMapper.toDto(productRepository.findByCategory(category));
+        return MapstructUtils.convert(productRepository.findByCategory(category), Product.class);
     }
 
     @Override
     public List<Product> findByUid(String uid) {
-        return ProductMapper.toDto(productRepository.findByUid(uid));
+        return MapstructUtils.convert(productRepository.findByUid(uid), Product.class);
     }
 
     @Override
@@ -37,7 +37,7 @@ public class ProductDataImpl implements IProductData {
         Page<TbProduct> productPage = productRepository.findByUid(uid,
                 Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(productPage.getTotalElements(),
-                ProductMapper.toDto(productPage.getContent()));
+                MapstructUtils.convert(productPage.getContent(), Product.class));
     }
 
     @Override
@@ -47,12 +47,12 @@ public class ProductDataImpl implements IProductData {
 
     @Override
     public Product findById(String s) {
-        return ProductMapper.M.toDto(productRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(productRepository.findById(s).orElse(null), Product.class);
     }
 
     @Override
     public Product save(Product data) {
-        productRepository.save(ProductMapper.M.toVo(data));
+        productRepository.save(MapstructUtils.convert(data, TbProduct.class));
         return data;
     }
 
@@ -67,6 +67,11 @@ public class ProductDataImpl implements IProductData {
         productRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return productRepository.count();
@@ -74,7 +79,7 @@ public class ProductDataImpl implements IProductData {
 
     @Override
     public List<Product> findAll() {
-        return ProductMapper.toDto(productRepository.findAll());
+        return MapstructUtils.convert(productRepository.findAll(), Product.class);
     }
 
     @Override
@@ -82,6 +87,6 @@ public class ProductDataImpl implements IProductData {
         Page<TbProduct> productPage = productRepository.findAll(
                 Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(productPage.getTotalElements(),
-                ProductMapper.toDto(productPage.getContent()));
+                MapstructUtils.convert(productPage.getContent(), Product.class));
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProductModelDataImpl.java

@@ -1,8 +1,9 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProductModelData;
 import cc.iotkit.data.dao.ProductModelRepository;
-import cc.iotkit.data.convert.ProductModelMapper;
+import cc.iotkit.data.model.TbProductModel;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.ProductModel;
 import org.apache.commons.lang3.StringUtils;
@@ -23,17 +24,17 @@ public class ProductModelDataImpl implements IProductModelData {
 
     @Override
     public ProductModel findByModel(String model) {
-        return ProductModelMapper.M.toDto(productModelRepository.findByModel(model));
+        return MapstructUtils.convert(productModelRepository.findByModel(model), ProductModel.class);
     }
 
     @Override
     public List<ProductModel> findByProductKey(String productKey) {
-        return ProductModelMapper.toDto(productModelRepository.findByProductKey(productKey));
+        return MapstructUtils.convert(productModelRepository.findByProductKey(productKey), ProductModel.class);
     }
 
     @Override
     public ProductModel findById(String s) {
-        return ProductModelMapper.M.toDto(productModelRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(productModelRepository.findById(s).orElse(null), ProductModel.class);
     }
 
     @Override
@@ -42,7 +43,7 @@ public class ProductModelDataImpl implements IProductModelData {
             data.setId(UUID.randomUUID().toString());
         }
         data.setModifyAt(System.currentTimeMillis());
-        productModelRepository.save(ProductModelMapper.M.toVo(data));
+        productModelRepository.save(MapstructUtils.convert(data, TbProductModel.class));
         return null;
     }
 
@@ -56,6 +57,11 @@ public class ProductModelDataImpl implements IProductModelData {
         productModelRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return productModelRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProtocolComponentDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProtocolComponentData;
 import cc.iotkit.data.dao.ProtocolComponentRepository;
-import cc.iotkit.data.convert.ProtocolComponentMapper;
 import cc.iotkit.data.model.TbProtocolComponent;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.protocol.ProtocolComponent;
@@ -25,17 +25,17 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
 
     @Override
     public List<ProtocolComponent> findByState(String state) {
-        return ProtocolComponentMapper.toDto(protocolComponentRepository.findByState(state));
+        return MapstructUtils.convert(protocolComponentRepository.findByState(state), ProtocolComponent.class);
     }
 
     @Override
     public List<ProtocolComponent> findByStateAndType(String state, String type) {
-        return ProtocolComponentMapper.toDto(protocolComponentRepository.findByStateAndType(state, type));
+        return MapstructUtils.convert(protocolComponentRepository.findByStateAndType(state, type), ProtocolComponent.class);
     }
 
     @Override
     public List<ProtocolComponent> findByUid(String uid) {
-        return ProtocolComponentMapper.toDto(protocolComponentRepository.findByUid(uid));
+        return MapstructUtils.convert(protocolComponentRepository.findByUid(uid), ProtocolComponent.class);
     }
 
     @Override
@@ -43,7 +43,7 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
         Page<TbProtocolComponent> paged = protocolComponentRepository.findByUid(uid,
                 Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(paged.getTotalElements(),
-                ProtocolComponentMapper.toDto(paged.getContent()));
+                MapstructUtils.convert(paged.getContent(), ProtocolComponent.class));
     }
 
     @Override
@@ -53,7 +53,7 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
 
     @Override
     public ProtocolComponent findById(String s) {
-        return ProtocolComponentMapper.M.toDto(protocolComponentRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(protocolComponentRepository.findById(s).orElse(null), ProtocolComponent.class);
     }
 
     @Override
@@ -62,7 +62,7 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
             data.setId(UUID.randomUUID().toString());
             data.setCreateAt(System.currentTimeMillis());
         }
-        protocolComponentRepository.save(ProtocolComponentMapper.M.toVo(data));
+        protocolComponentRepository.save(MapstructUtils.convert(data, TbProtocolComponent.class));
         return data;
     }
 
@@ -76,6 +76,11 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
         protocolComponentRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return protocolComponentRepository.count();
@@ -83,7 +88,7 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
 
     @Override
     public List<ProtocolComponent> findAll() {
-        return ProtocolComponentMapper.toDto(protocolComponentRepository.findAll());
+        return MapstructUtils.convert(protocolComponentRepository.findAll(), ProtocolComponent.class);
     }
 
     @Override
@@ -91,6 +96,6 @@ public class ProtocolComponentDataImpl implements IProtocolComponentData {
         Page<TbProtocolComponent> paged = protocolComponentRepository
                 .findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(paged.getTotalElements(),
-                ProtocolComponentMapper.toDto(paged.getContent()));
+                MapstructUtils.convert(paged.getContent(), ProtocolComponent.class));
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ProtocolConverterDataImpl.java

@@ -9,9 +9,9 @@
  */
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.IProtocolConverterData;
 import cc.iotkit.data.dao.ProtocolConverterRepository;
-import cc.iotkit.data.convert.ProtocolConverterMapper;
 import cc.iotkit.data.model.TbProtocolConverter;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.protocol.ProtocolConverter;
@@ -34,7 +34,7 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
 
     @Override
     public List<ProtocolConverter> findByUid(String uid) {
-        return ProtocolConverterMapper.toDto(protocolConverterRepository.findByUid(uid));
+        return MapstructUtils.convert(protocolConverterRepository.findByUid(uid), ProtocolConverter.class);
     }
 
     @Override
@@ -42,7 +42,7 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
         Page<TbProtocolConverter> paged = protocolConverterRepository
                 .findByUid(uid, Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(paged.getTotalElements(),
-                ProtocolConverterMapper.toDto(paged.getContent()));
+                MapstructUtils.convert(paged.getContent(), ProtocolConverter.class));
     }
 
     @Override
@@ -52,8 +52,8 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
 
     @Override
     public ProtocolConverter findById(String s) {
-        return ProtocolConverterMapper.M.toDto(
+        return MapstructUtils.convert(
-                protocolConverterRepository.findById(s).orElse(null));
+                protocolConverterRepository.findById(s).orElse(null), ProtocolConverter.class);
     }
 
     @Override
@@ -62,7 +62,7 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
             data.setId(UUID.randomUUID().toString());
             data.setCreateAt(System.currentTimeMillis());
         }
-        protocolConverterRepository.save(ProtocolConverterMapper.M.toVo(data));
+        protocolConverterRepository.save(MapstructUtils.convert(data, TbProtocolConverter.class));
         return data;
     }
 
@@ -76,6 +76,11 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
         protocolConverterRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return protocolConverterRepository.count();
@@ -83,7 +88,7 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
 
     @Override
     public List<ProtocolConverter> findAll() {
-        return ProtocolConverterMapper.toDto(protocolConverterRepository.findAll());
+        return MapstructUtils.convert(protocolConverterRepository.findAll(), ProtocolConverter.class);
     }
 
     @Override
@@ -91,6 +96,6 @@ public class ProtocolConverterDataImpl implements IProtocolConverterData {
         Page<TbProtocolConverter> paged = protocolConverterRepository
                 .findAll(Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(paged.getTotalElements(),
-                ProtocolConverterMapper.toDto(paged.getContent()));
+                MapstructUtils.convert(paged.getContent(), ProtocolConverter.class));
     }
 }

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/RuleInfoDataImpl.java

@@ -11,8 +11,8 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.data.manager.IRuleInfoData;
 import cc.iotkit.data.dao.RuleInfoRepository;
-import cc.iotkit.data.convert.RuleInfoMapper;
 import cc.iotkit.data.model.TbRuleInfo;
+import cc.iotkit.data.service.convert.RuleInfoMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.rule.RuleInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -96,6 +96,11 @@ public class RuleInfoDataImpl implements IRuleInfoData {
         ruleInfoRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return ruleInfoRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SpaceDataImpl.java

@@ -1,8 +1,8 @@
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ISpaceData;
 import cc.iotkit.data.dao.SpaceRepository;
-import cc.iotkit.data.convert.SpaceMapper;
 import cc.iotkit.data.model.TbSpace;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.space.Space;
@@ -25,22 +25,22 @@ public class SpaceDataImpl implements ISpaceData {
 
     @Override
     public List<Space> findByUidOrderByCreateAtDesc(String uid) {
-        return SpaceMapper.toDto(spaceRepository.findByUidOrderByCreateAtDesc(uid));
+        return MapstructUtils.convert(spaceRepository.findByUidOrderByCreateAtDesc(uid), Space.class);
     }
 
     @Override
     public List<Space> findByUidAndHomeIdOrderByCreateAtDesc(String uid, String homeId) {
-        return SpaceMapper.toDto(spaceRepository.findByUidAndHomeIdOrderByCreateAtDesc(uid, homeId));
+        return MapstructUtils.convert(spaceRepository.findByUidAndHomeIdOrderByCreateAtDesc(uid, homeId), Space.class);
     }
 
     @Override
     public List<Space> findByHomeId(String homeId) {
-        return SpaceMapper.toDto(spaceRepository.findByHomeId(homeId));
+        return MapstructUtils.convert(spaceRepository.findByHomeId(homeId), Space.class);
     }
 
     @Override
     public List<Space> findByUid(String uid) {
-        return SpaceMapper.toDto(spaceRepository.findByUid(uid));
+        return MapstructUtils.convert(spaceRepository.findByUid(uid), Space.class);
     }
 
     @Override
@@ -48,7 +48,7 @@ public class SpaceDataImpl implements ISpaceData {
         Page<TbSpace> paged = spaceRepository.findByUid(uid,
                 Pageable.ofSize(size).withPage(page - 1));
         return new Paging<>(paged.getTotalElements(),
-                SpaceMapper.toDto(paged.getContent()));
+                MapstructUtils.convert(paged.getContent(), Space.class));
     }
 
     @Override
@@ -58,7 +58,7 @@ public class SpaceDataImpl implements ISpaceData {
 
     @Override
     public Space findById(String s) {
-        return SpaceMapper.M.toDto(spaceRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(spaceRepository.findById(s).orElse(null), Space.class);
     }
 
     @Override
@@ -66,7 +66,7 @@ public class SpaceDataImpl implements ISpaceData {
         if (StringUtils.isBlank(data.getId())) {
             data.setId(UUID.randomUUID().toString());
         }
-        spaceRepository.save(SpaceMapper.M.toVo(data));
+        spaceRepository.save(MapstructUtils.convert(data, TbSpace.class));
         return data;
     }
 
@@ -80,6 +80,11 @@ public class SpaceDataImpl implements ISpaceData {
         spaceRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return spaceRepository.count();
@@ -87,7 +92,7 @@ public class SpaceDataImpl implements ISpaceData {
 
     @Override
     public List<Space> findAll() {
-        return SpaceMapper.toDto(spaceRepository.findAll());
+        return MapstructUtils.convert(spaceRepository.findAll(), Space.class);
     }
 
     @Override

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SpaceDeviceDataImpl.java

@@ -9,9 +9,10 @@
  */
 package cc.iotkit.data.service;
 
+import cc.iotkit.common.utils.MapstructUtils;
 import cc.iotkit.data.manager.ISpaceDeviceData;
 import cc.iotkit.data.dao.SpaceDeviceRepository;
-import cc.iotkit.data.convert.SpaceDeviceMapper;
+import cc.iotkit.data.model.TbSpaceDevice;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.space.SpaceDevice;
 import org.apache.commons.lang3.StringUtils;
@@ -31,42 +32,42 @@ public class SpaceDeviceDataImpl implements ISpaceDeviceData {
 
     @Override
     public List<SpaceDevice> findByUidOrderByUseAtDesc(String uid) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findByUidOrderByUseAtDesc(uid));
+        return MapstructUtils.convert(spaceDeviceRepository.findByUidOrderByUseAtDesc(uid), SpaceDevice.class);
     }
 
     @Override
-    public List<SpaceDevice> findByHomeIdAndCollect(String homeId,boolean collect) {
+    public List<SpaceDevice> findByHomeIdAndCollect(String homeId, boolean collect) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findByHomeIdAndCollect(homeId,collect));
+        return MapstructUtils.convert(spaceDeviceRepository.findByHomeIdAndCollect(homeId, collect), SpaceDevice.class);
     }
 
     @Override
     public List<SpaceDevice> findByUidOrderByAddAtDesc(String uid) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findByUidOrderByAddAtDesc(uid));
+        return MapstructUtils.convert(spaceDeviceRepository.findByUidOrderByAddAtDesc(uid), SpaceDevice.class);
     }
 
     @Override
     public List<SpaceDevice> findBySpaceIdOrderByAddAtDesc(String spaceId) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findBySpaceIdOrderByAddAtDesc(spaceId));
+        return MapstructUtils.convert(spaceDeviceRepository.findBySpaceIdOrderByAddAtDesc(spaceId), SpaceDevice.class);
     }
 
     @Override
     public List<SpaceDevice> findByUidAndSpaceIdOrderByAddAtDesc(String uid, String spaceId) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findByUidAndSpaceIdOrderByAddAtDesc(uid, spaceId));
+        return MapstructUtils.convert(spaceDeviceRepository.findByUidAndSpaceIdOrderByAddAtDesc(uid, spaceId), SpaceDevice.class);
     }
 
     @Override
     public SpaceDevice findByDeviceId(String deviceId) {
-        return SpaceDeviceMapper.M.toDto(spaceDeviceRepository.findByDeviceId(deviceId));
+        return MapstructUtils.convert(spaceDeviceRepository.findByDeviceId(deviceId), SpaceDevice.class);
     }
 
     @Override
     public SpaceDevice findByDeviceIdAndUid(String deviceId, String uid) {
-        return SpaceDeviceMapper.M.toDto(spaceDeviceRepository.findByDeviceIdAndUid(deviceId, uid));
+        return MapstructUtils.convert(spaceDeviceRepository.findByDeviceIdAndUid(deviceId, uid), SpaceDevice.class);
     }
 
     @Override
     public List<SpaceDevice> findByUid(String uid) {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findByUid(uid));
+        return MapstructUtils.convert(spaceDeviceRepository.findByUid(uid), SpaceDevice.class);
     }
 
     @Override
@@ -81,7 +82,7 @@ public class SpaceDeviceDataImpl implements ISpaceDeviceData {
 
     @Override
     public SpaceDevice findById(String s) {
-        return SpaceDeviceMapper.M.toDto(spaceDeviceRepository.findById(s).orElse(null));
+        return MapstructUtils.convert(spaceDeviceRepository.findById(s).orElse(null), SpaceDevice.class);
     }
 
     @Override
@@ -90,7 +91,7 @@ public class SpaceDeviceDataImpl implements ISpaceDeviceData {
             data.setId(UUID.randomUUID().toString());
             data.setAddAt(System.currentTimeMillis());
         }
-        spaceDeviceRepository.save(SpaceDeviceMapper.M.toVo(data));
+        spaceDeviceRepository.save(MapstructUtils.convert(data, TbSpaceDevice.class));
         return data;
     }
 
@@ -104,6 +105,11 @@ public class SpaceDeviceDataImpl implements ISpaceDeviceData {
         spaceDeviceRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return spaceDeviceRepository.count();
@@ -111,7 +117,7 @@ public class SpaceDeviceDataImpl implements ISpaceDeviceData {
 
     @Override
     public List<SpaceDevice> findAll() {
-        return SpaceDeviceMapper.toDto(spaceDeviceRepository.findAll());
+        return MapstructUtils.convert(spaceDeviceRepository.findAll(), SpaceDevice.class);
     }
 
     @Override

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/TaskInfoDataImpl.java

@@ -11,8 +11,8 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.data.manager.ITaskInfoData;
 import cc.iotkit.data.dao.TaskInfoRepository;
-import cc.iotkit.data.convert.TaskInfoMapper;
 import cc.iotkit.data.model.TbTaskInfo;
+import cc.iotkit.data.service.convert.TaskInfoMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.rule.TaskInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -75,6 +75,11 @@ public class TaskInfoDataImpl implements ITaskInfoData {
         taskInfoRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return taskInfoRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/ThingModelDataImpl.java

@@ -11,7 +11,7 @@ package cc.iotkit.data.service;
 
 import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.data.dao.ThingModelRepository;
-import cc.iotkit.data.convert.ThingModelMapper;
+import cc.iotkit.data.service.convert.ThingModelMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.product.ThingModel;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +53,11 @@ public class ThingModelDataImpl implements IThingModelData {
         thingModelRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return 0;

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/UserInfoDataImpl.java

@@ -12,7 +12,7 @@ package cc.iotkit.data.service;
 import cc.iotkit.data.manager.IUserInfoData;
 import cc.iotkit.data.dao.UserInfoRepository;
 import cc.iotkit.data.model.TbUserInfo;
-import cc.iotkit.data.convert.UserInfoMapper;
+import cc.iotkit.data.service.convert.UserInfoMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.UserInfo;
 import org.apache.commons.lang3.StringUtils;
@@ -72,6 +72,11 @@ public class UserInfoDataImpl implements IUserInfoData {
         userInfoRepository.deleteById(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return userInfoRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/VirtualDeviceDataImpl.java

@@ -14,7 +14,7 @@ import cc.iotkit.data.dao.VirtualDeviceMappingRepository;
 import cc.iotkit.data.dao.VirtualDeviceRepository;
 import cc.iotkit.data.model.TbVirtualDevice;
 import cc.iotkit.data.model.TbVirtualDeviceMapping;
-import cc.iotkit.data.convert.VirtualDeviceMapper;
+import cc.iotkit.data.service.convert.VirtualDeviceMapper;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.VirtualDevice;
 import cn.hutool.core.util.IdUtil;
@@ -117,6 +117,11 @@ public class VirtualDeviceDataImpl implements IVirtualDeviceData {
         virtualDeviceMappingRepository.deleteByVirtualId(s);
     }
 
+    @Override
+    public void deleteByIds(String[] strings) {
+
+    }
+
     @Override
     public long count() {
         return virtualDeviceRepository.count();

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/DeviceInfoMapper.java

@@ -0,0 +1,28 @@
+package cc.iotkit.data.service.convert;
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+
+import cc.iotkit.data.model.TbDeviceInfo;
+import cc.iotkit.model.device.DeviceInfo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface DeviceInfoMapper {
+
+    DeviceInfoMapper M = Mappers.getMapper(DeviceInfoMapper.class);
+
+    @Mapping(target = "state", ignore = true)
+    DeviceInfo toDto(TbDeviceInfo vo);
+
+    @Mapping(target = "state", ignore = true)
+    TbDeviceInfo toVo(DeviceInfo dto);
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/RuleInfoMapper.java

@@ -0,0 +1,66 @@
+package cc.iotkit.data.service.convert;
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+import cc.iotkit.common.utils.JsonUtils;
+import cc.iotkit.data.model.TbRuleInfo;
+import cc.iotkit.model.rule.RuleInfo;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface RuleInfoMapper {
+
+    RuleInfoMapper M = Mappers.getMapper(RuleInfoMapper.class);
+
+    @Mappings({
+            @Mapping(target = "listeners", ignore = true),
+            @Mapping(target = "filters", ignore = true),
+            @Mapping(target = "actions", ignore = true)
+    }
+    )
+    RuleInfo toDto(TbRuleInfo vo);
+
+    @Mappings({
+            @Mapping(target = "listeners", ignore = true),
+            @Mapping(target = "filters", ignore = true),
+            @Mapping(target = "actions", ignore = true)
+    }
+    )
+    TbRuleInfo toVo(RuleInfo dto);
+
+    static RuleInfo toDtoFix(TbRuleInfo vo) {
+        RuleInfo dto = M.toDto(vo);
+        dto.setListeners(JsonUtils.parseObject(vo.getListeners(), new TypeReference<>() {
+        }));
+        dto.setFilters(JsonUtils.parseObject(vo.getFilters(), new TypeReference<>() {
+        }));
+        dto.setActions(JsonUtils.parseObject(vo.getActions(), new TypeReference<>() {
+        }));
+        return dto;
+    }
+
+    static TbRuleInfo toVoFix(RuleInfo dto) {
+        TbRuleInfo vo = M.toVo(dto);
+        vo.setListeners(JsonUtils.toJsonString(dto.getListeners()));
+        vo.setFilters(JsonUtils.toJsonString(dto.getFilters()));
+        vo.setActions(JsonUtils.toJsonString(dto.getActions()));
+        return vo;
+    }
+
+    static List<RuleInfo> toDto(List<TbRuleInfo> list) {
+        return list.stream().map(RuleInfoMapper::toDtoFix).collect(Collectors.toList());
+    }
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/TaskInfoMapper.java

@@ -0,0 +1,51 @@
+package cc.iotkit.data.service.convert;
+
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+import cc.iotkit.common.utils.JsonUtils;
+import cc.iotkit.data.model.TbTaskInfo;
+import cc.iotkit.model.rule.TaskInfo;
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface TaskInfoMapper {
+
+    TaskInfoMapper M = Mappers.getMapper(TaskInfoMapper.class);
+
+    @Mapping(target = "actions", ignore = true)
+    TaskInfo toDto(TbTaskInfo vo);
+
+    static TaskInfo toDtoFix(TbTaskInfo vo) {
+        TaskInfo dto = M.toDto(vo);
+        dto.setActions(JsonUtils.parseObject(vo.getActions(), new TypeReference<>() {
+        }));
+        return dto;
+    }
+
+    @Mapping(target = "actions", ignore = true)
+    TbTaskInfo toVo(TaskInfo dto);
+
+    static TbTaskInfo toVoFix(TaskInfo dto) {
+        TbTaskInfo vo = M.toVo(dto);
+        vo.setActions(JsonUtils.toJsonString(dto.getActions()));
+        return vo;
+    }
+
+    static List<TaskInfo> toDto(List<TbTaskInfo> list) {
+        return list.stream().map(TaskInfoMapper::toDtoFix).collect(Collectors.toList());
+    }
+
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/ThingModelMapper.java

@@ -0,0 +1,54 @@
+package cc.iotkit.data.service.convert;
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+import cc.iotkit.common.utils.JsonUtils;
+import cc.iotkit.data.model.TbThingModel;
+import cc.iotkit.model.product.ThingModel;
+import org.apache.commons.lang3.StringUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface ThingModelMapper {
+
+    ThingModelMapper M = Mappers.getMapper(ThingModelMapper.class);
+
+    @Mapping(target = "model", ignore = true)
+    ThingModel toDto(TbThingModel vo);
+
+    static ThingModel toDtoFix(TbThingModel vo) {
+        if (vo == null) {
+            return null;
+        }
+        ThingModel dto = M.toDto(vo);
+        if (StringUtils.isNotBlank(vo.getModel())) {
+            dto.setModel(JsonUtils.parseObject(vo.getModel(), ThingModel.Model.class));
+        }
+        return dto;
+    }
+
+    @Mapping(target = "model", ignore = true)
+    TbThingModel toVo(ThingModel dto);
+
+    static TbThingModel toVoFix(ThingModel dto) {
+        TbThingModel vo = M.toVo(dto);
+        vo.setModel(JsonUtils.toJsonString(dto.getModel()));
+        return vo;
+    }
+
+    static List<ThingModel> toDto(List<TbThingModel> list) {
+        return list.stream().map(ThingModelMapper::toDtoFix).collect(Collectors.toList());
+    }
+
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/UserInfoMapper.java

@@ -0,0 +1,80 @@
+package cc.iotkit.data.service.convert;
+
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+import cc.iotkit.data.model.TbUserInfo;
+import cc.iotkit.model.UserInfo;
+import org.apache.commons.lang3.StringUtils;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import org.mapstruct.factory.Mappers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface UserInfoMapper {
+
+    UserInfoMapper M = Mappers.getMapper(UserInfoMapper.class);
+
+    @Mappings({
+            @Mapping(target = "roles", ignore = true),
+            @Mapping(target = "permissions", ignore = true),
+            @Mapping(target = "usePlatforms", ignore = true)
+    }
+    )
+    UserInfo toDto(TbUserInfo vo);
+
+    static UserInfo toDtoFix(TbUserInfo vo) {
+        UserInfo dto = M.toDto(vo);
+        dto.setRoles(splitToList(vo.getRoles()));
+        dto.setPermissions(splitToList(vo.getPermissions()));
+        dto.setUsePlatforms(splitToList(vo.getUsePlatforms()));
+        return dto;
+    }
+
+    @Mappings({
+            @Mapping(target = "roles", ignore = true),
+            @Mapping(target = "permissions", ignore = true),
+            @Mapping(target = "usePlatforms", ignore = true)
+    }
+    )
+    TbUserInfo toVo(UserInfo dto);
+
+    static TbUserInfo toVoFix(UserInfo dto) {
+        TbUserInfo vo = M.toVo(dto);
+        vo.setRoles(listToStr(dto.getRoles()));
+        vo.setPermissions(listToStr(dto.getPermissions()));
+        vo.setUsePlatforms(listToStr(dto.getUsePlatforms()));
+        return vo;
+    }
+
+    static List<UserInfo> toDto(List<TbUserInfo> list) {
+        return list.stream().map(UserInfoMapper::toDtoFix).collect(Collectors.toList());
+    }
+
+    static List<String> splitToList(String str) {
+        if (StringUtils.isBlank(str)) {
+            return new ArrayList<>();
+        }
+        return Arrays.asList(str.split(","));
+    }
+
+    static String listToStr(List<String> list) {
+        if (list == null || list.size() == 0) {
+            return "";
+        }
+        return String.join(",", list);
+    }
+
+}

iot-common/iot-common-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/convert/VirtualDeviceMapper.java

@@ -0,0 +1,34 @@
+package cc.iotkit.data.service.convert;
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+import cc.iotkit.data.model.TbVirtualDevice;
+import cc.iotkit.model.device.VirtualDevice;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface VirtualDeviceMapper {
+
+    VirtualDeviceMapper M = Mappers.getMapper(VirtualDeviceMapper.class);
+
+    @Mapping(target = "devices", ignore = true)
+    VirtualDevice toDto(TbVirtualDevice vo);
+
+    TbVirtualDevice toVo(VirtualDevice dto);
+
+    static List<VirtualDevice> toDto(List<TbVirtualDevice> list) {
+        return list.stream().map(VirtualDeviceMapper.M::toDto).collect(Collectors.toList());
+    }
+
+}

iot-common/iot-common-dao/iot-temporal-serviceImpl-es/src/main/java/cc/iotkit/temporal/es/service/ThingModelMessageDataImpl.java

@@ -26,9 +26,9 @@ import org.elasticsearch.search.aggregations.bucket.histogram.ParsedDateHistogra
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.core.ElasticsearchAggregations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.clients.elasticsearch7.ElasticsearchAggregations;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
@@ -46,6 +46,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
     @Autowired
     private ThingModelMessageRepository thingModelMessageRepository;
 
+    @Override
     public Paging<ThingModelMessage> findByTypeAndIdentifier(String deviceId, String type,
                                                              String identifier,
                                                              int page, int size) {

iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/DbStructureDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.ts.service;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.model.product.ThingModel;
 import cc.iotkit.temporal.IDbStructureData;
 import cc.iotkit.temporal.ts.config.Constants;

iot-common/iot-common-dao/iot-temporal-serviceImpl-ts/src/main/java/cc/iotkit/temporal/ts/service/ThingModelMessageDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.ts.service;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
@@ -121,7 +121,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
                         msg.getProductKey(), msg.getDeviceName(),
                         msg.getUid(), msg.getType(),
                         msg.getIdentifier(), msg.getCode(),
-                        msg.getData() == null ? "{}" : JsonUtil.toJsonString(msg.getData()),
+                        msg.getData() == null ? "{}" : JsonUtils.toJsonString(msg.getData()),
                         msg.getTime()).getSQL(ParamType.INLINED);
         tsTemplate.update(sql);
     }

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/dm/TdRestApi.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.dm;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -57,7 +57,7 @@ public class TdRestApi {
         log.info("exec td sql:{}", sql);
         HttpRequest request = newApiRequest(sql);
         HttpResponse response = request.execute();
-        return JsonUtil.parse(response.body(), TdResponse.class);
+        return JsonUtils.parseObject(response.body(), TdResponse.class);
     }
 
 

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/DbStructureDataImpl.java

@@ -10,7 +10,7 @@
 package cc.iotkit.temporal.td.service;
 
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.model.product.ThingModel;
 import cc.iotkit.temporal.IDbStructureData;
 import cc.iotkit.temporal.td.config.Constants;
@@ -67,7 +67,7 @@ public class DbStructureDataImpl implements IDbStructureData {
             String sql = TableManager.getDescTableSql(tbName);
             TdResponse response = tdRestApi.execSql(sql);
             if (response.getCode() != TdResponse.CODE_SUCCESS) {
-                throw new BizException("get des table error:" + JsonUtil.toJsonString(response));
+                throw new BizException("get des table error:" + JsonUtils.toJsonString(response));
             }
 
             List<TdField> oldFields = FieldParser.parse(response.getData());
@@ -82,7 +82,7 @@ public class DbStructureDataImpl implements IDbStructureData {
                 sql = TableManager.getAddSTableColumnSql(tbName, addFields);
                 response = tdRestApi.execSql(sql);
                 if (response.getCode() != TdResponse.CODE_SUCCESS) {
-                    throw new BizException("add table column error:" + JsonUtil.toJsonString(response));
+                    throw new BizException("add table column error:" + JsonUtils.toJsonString(response));
                 }
             }
 
@@ -99,7 +99,7 @@ public class DbStructureDataImpl implements IDbStructureData {
                 sql = TableManager.getModifySTableColumnSql(tbName, modifyFields);
                 response = tdRestApi.execSql(sql);
                 if (response.getCode() != TdResponse.CODE_SUCCESS) {
-                    throw new BizException("modify table column error:" + JsonUtil.toJsonString(response));
+                    throw new BizException("modify table column error:" + JsonUtils.toJsonString(response));
                 }
             }
 
@@ -114,7 +114,7 @@ public class DbStructureDataImpl implements IDbStructureData {
                 sql = TableManager.getDropSTableColumnSql(tbName, dropFields);
                 response = tdRestApi.execSql(sql);
                 if (response.getCode() != TdResponse.CODE_SUCCESS) {
-                    throw new BizException("drop table column error:" + JsonUtil.toJsonString(response));
+                    throw new BizException("drop table column error:" + JsonUtils.toJsonString(response));
                 }
             }
         } catch (Throwable e) {
@@ -136,7 +136,7 @@ public class DbStructureDataImpl implements IDbStructureData {
         ), new TdField("rule_id", "NCHAR", 50));
         TdResponse response = tdRestApi.execSql(sql);
         if (response.getCode() != TdResponse.CODE_SUCCESS) {
-            throw new BizException("create stable rule_log error:" + JsonUtil.toJsonString(response));
+            throw new BizException("create stable rule_log error:" + JsonUtils.toJsonString(response));
         }
 
         //创建规则日志超级表
@@ -146,7 +146,7 @@ public class DbStructureDataImpl implements IDbStructureData {
         ), new TdField("task_id", "NCHAR", 50));
         response = tdRestApi.execSql(sql);
         if (response.getCode() != TdResponse.CODE_SUCCESS) {
-            throw new BizException("create stable task_log error:" + JsonUtil.toJsonString(response));
+            throw new BizException("create stable task_log error:" + JsonUtils.toJsonString(response));
         }
 
         //创建物模型消息超级表
@@ -163,7 +163,7 @@ public class DbStructureDataImpl implements IDbStructureData {
         ), new TdField("device_id", "NCHAR", 50));
         response = tdRestApi.execSql(sql);
         if (response.getCode() != TdResponse.CODE_SUCCESS) {
-            throw new BizException("create stable thing_model_message error:" + JsonUtil.toJsonString(response));
+            throw new BizException("create stable thing_model_message error:" + JsonUtils.toJsonString(response));
         }
 
         //创建虚拟设备日志超级表
@@ -174,7 +174,7 @@ public class DbStructureDataImpl implements IDbStructureData {
         ), new TdField("virtual_device_id", "NCHAR", 50));
         response = tdRestApi.execSql(sql);
         if (response.getCode() != TdResponse.CODE_SUCCESS) {
-            throw new BizException("create stable virtual_device_log error:" + JsonUtil.toJsonString(response));
+            throw new BizException("create stable virtual_device_log error:" + JsonUtils.toJsonString(response));
         }
 
     }

iot-common/iot-common-dao/iot-temproal-serviceImpl-td/src/main/java/cc/iotkit/temporal/td/service/ThingModelMessageDataImpl.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.temporal.td.service;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.model.Paging;
 import cc.iotkit.model.device.message.ThingModelMessage;
 import cc.iotkit.model.stats.TimeData;
@@ -32,6 +32,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
     @Autowired
     private TdTemplate tdTemplate;
 
+    @Override
     public Paging<ThingModelMessage> findByTypeAndIdentifier(String deviceId, String type,
                                                              String identifier,
                                                              int page, int size) {
@@ -66,7 +67,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
                         new ThingModelMessage(r.getTime().toString(), r.getMid(),
                                 deviceId, r.getProductKey(), r.getDeviceName(),
                                 r.getUid(), r.getType(), r.getIdentifier(), r.getCode(),
-                                JsonUtil.parse(r.getData(), Map.class),
+                                JsonUtils.parseObject(r.getData(), Map.class),
                                 r.getTime(), r.getReportTime()))
                 .collect(Collectors.toList()));
     }
@@ -102,7 +103,7 @@ public class ThingModelMessageDataImpl implements IThingModelMessageData {
                 msg.getProductKey(), msg.getDeviceName(),
                 msg.getUid(), msg.getType(),
                 msg.getIdentifier(), msg.getCode(),
-                msg.getData() == null ? "{}" : JsonUtil.toJsonString(msg.getData()),
+                msg.getData() == null ? "{}" : JsonUtils.toJsonString(msg.getData()),
                 msg.getTime());
     }
 

iot-common/iot-common-doc/src/main/java/cc/iotkit/swagger/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package cc.iotkit.common.undefined;
+package cc.iotkit.swagger.config;
 
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import io.swagger.annotations.Api;

iot-common/iot-common-excel/src/main/java/cc/iotkit/common/excel/convert/ExcelDictConvert.java

@@ -1,5 +1,10 @@
 package cc.iotkit.common.excel.convert;
 
+import cc.iotkit.common.excel.annotation.ExcelDictFormat;
+import cc.iotkit.common.excel.utils.ExcelUtil;
+import cc.iotkit.common.service.DictService;
+import cc.iotkit.common.utils.SpringUtils;
+import cc.iotkit.common.utils.StringUtils;
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
@@ -10,11 +15,6 @@ import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.service.DictService;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.utils.ExcelUtil;
 
 import java.lang.reflect.Field;
 

iot-common/iot-common-excel/src/main/java/cc/iotkit/common/excel/convert/ExcelEnumConvert.java

@@ -1,5 +1,7 @@
 package cc.iotkit.common.excel.convert;
 
+import cc.iotkit.common.excel.annotation.ExcelEnumFormat;
+import cc.iotkit.common.utils.ReflectUtils;
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
@@ -10,8 +12,6 @@ import com.alibaba.excel.metadata.data.ReadCellData;
 import com.alibaba.excel.metadata.data.WriteCellData;
 import com.alibaba.excel.metadata.property.ExcelContentProperty;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.utils.reflect.ReflectUtils;
-import org.dromara.common.excel.annotation.ExcelEnumFormat;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

iot-common/iot-common-excel/src/main/java/cc/iotkit/common/excel/core/CellMergeStrategy.java

@@ -1,5 +1,7 @@
 package cc.iotkit.common.excel.core;
 
+import cc.iotkit.common.excel.annotation.CellMerge;
+import cc.iotkit.common.utils.ReflectUtils;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.metadata.Head;
@@ -11,8 +13,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.util.CellRangeAddress;
-import org.dromara.common.core.utils.reflect.ReflectUtils;
-import org.dromara.common.excel.annotation.CellMerge;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

iot-common/iot-common-redis/src/main/java/cc/iotkit/common/redis/config/RedisConfig.java

@@ -1,10 +1,10 @@
 package cc.iotkit.common.redis.config;
 
+import cc.iotkit.common.redis.config.properties.RedissonProperties;
+import cc.iotkit.common.redis.handler.KeyPrefixHandler;
+import cc.iotkit.common.redis.manager.PlusSpringCacheManager;
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.dromara.common.redis.config.properties.RedissonProperties;
-import org.dromara.common.redis.handler.KeyPrefixHandler;
-import org.dromara.common.redis.manager.PlusSpringCacheManager;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;

iot-common/iot-common-redis/src/main/java/cc/iotkit/common/redis/handler/KeyPrefixHandler.java

@@ -1,6 +1,6 @@
 package cc.iotkit.common.redis.handler;
 
-import org.dromara.common.core.utils.StringUtils;
+import cc.iotkit.common.utils.StringUtils;
 import org.redisson.api.NameMapper;
 
 /**

iot-common/iot-common-redis/src/main/java/cc/iotkit/common/redis/manager/PlusSpringCacheManager.java

@@ -15,7 +15,7 @@
  */
 package cc.iotkit.common.redis.manager;
 
-import org.dromara.common.redis.utils.RedisUtils;
+import cc.iotkit.common.redis.utils.RedisUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.spring.cache.CacheConfig;

iot-common/iot-common-redis/src/main/java/cc/iotkit/common/redis/utils/CacheUtils.java

@@ -1,6 +1,6 @@
 package cc.iotkit.common.redis.utils;
 
-import org.dromara.common.core.utils.SpringUtils;
+import cc.iotkit.common.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.RMap;

iot-common/iot-common-redis/src/main/java/cc/iotkit/common/redis/utils/QueueUtils.java

@@ -1,6 +1,6 @@
 package cc.iotkit.common.redis.utils;
 
-import org.dromara.common.core.utils.SpringUtils;
+import cc.iotkit.common.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.*;

iot-common/iot-common-satoken/src/main/java/cc/iotkit/common/satoken/listener/UserActionListener.java

@@ -6,7 +6,6 @@ import cc.iotkit.common.redis.utils.RedisUtils;
 import cc.iotkit.common.satoken.utils.LoginHelper;
 import cc.iotkit.common.undefined.LoginUser;
 import cc.iotkit.common.undefined.UserOnlineDTO;
-import cc.iotkit.common.utils.ServletUtils;
 import cc.iotkit.common.utils.ip.AddressUtils;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;

iot-common/iot-common-tenant/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>iot-common-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cc.iotkit</groupId>
+            <artifactId>iot-common-satoken</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

iot-common/iot-common-tenant/src/main/java/cc/iotkit/common/tenant/config/TenantConfig.java

@@ -1,19 +1,12 @@
 package cc.iotkit.common.tenant.config;
 
+import cc.iotkit.common.redis.config.RedisConfig;
+import cc.iotkit.common.tenant.core.TenantSaTokenDao;
+import cc.iotkit.common.tenant.manager.TenantSpringCacheManager;
+import cc.iotkit.common.tenant.properties.TenantProperties;
+import cc.iotkit.common.utils.ReflectUtils;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
-import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
-import org.dromara.common.core.utils.reflect.ReflectUtils;
-import org.dromara.common.mybatis.config.MybatisPlusConfig;
-import org.dromara.common.redis.config.RedisConfig;
-import org.dromara.common.redis.config.properties.RedissonProperties;
-import org.dromara.common.tenant.core.TenantSaTokenDao;
-import org.dromara.common.tenant.handle.PlusTenantLineHandler;
-import org.dromara.common.tenant.handle.TenantKeyPrefixHandler;
-import org.dromara.common.tenant.manager.TenantSpringCacheManager;
-import org.dromara.common.tenant.properties.TenantProperties;
 import org.redisson.config.ClusterServersConfig;
 import org.redisson.config.SingleServerConfig;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
@@ -25,7 +18,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 
 import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 租户配置类
@@ -33,7 +25,7 @@ import java.util.List;
  * @author Lion Li
  */
 @EnableConfigurationProperties(TenantProperties.class)
-@AutoConfiguration(after = {RedisConfig.class, MybatisPlusConfig.class})
+@AutoConfiguration(after = {RedisConfig.class})
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
 public class TenantConfig {
 

iot-common/iot-common-tenant/src/main/java/cc/iotkit/common/tenant/core/TenantSaTokenDao.java

@@ -1,8 +1,8 @@
 package cc.iotkit.common.tenant.core;
 
-import org.dromara.common.core.constant.GlobalConstants;
+import cc.iotkit.common.constant.GlobalConstants;
-import org.dromara.common.redis.utils.RedisUtils;
+import cc.iotkit.common.redis.utils.RedisUtils;
-import org.dromara.common.satoken.core.dao.PlusSaTokenDao;
+import cc.iotkit.common.satoken.core.dao.PlusSaTokenDao;
 
 import java.time.Duration;
 import java.util.List;

iot-common/iot-common-tenant/src/main/java/cc/iotkit/common/tenant/handle/PlusTenantLineHandler.java

@@ -1,15 +1,11 @@
 package cc.iotkit.common.tenant.handle;
 
+import cc.iotkit.common.satoken.utils.LoginHelper;
+import cc.iotkit.common.tenant.helper.TenantHelper;
+import cc.iotkit.common.tenant.properties.TenantProperties;
+import cc.iotkit.common.utils.StringUtils;
 import cn.hutool.core.collection.ListUtil;
-import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import lombok.AllArgsConstructor;
-import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.NullValue;
-import net.sf.jsqlparser.expression.StringValue;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.tenant.helper.TenantHelper;
-import org.dromara.common.tenant.properties.TenantProperties;
 
 import java.util.List;
 

iot-common/iot-common-tenant/src/main/java/cc/iotkit/common/tenant/handle/TenantKeyPrefixHandler.java

@@ -1,9 +1,10 @@
 package cc.iotkit.common.tenant.handle;
 
-import org.dromara.common.core.constant.GlobalConstants;
+
-import org.dromara.common.core.utils.StringUtils;
+import cc.iotkit.common.constant.GlobalConstants;
-import org.dromara.common.redis.handler.KeyPrefixHandler;
+import cc.iotkit.common.redis.handler.KeyPrefixHandler;
-import org.dromara.common.tenant.helper.TenantHelper;
+import cc.iotkit.common.tenant.helper.TenantHelper;
+import cc.iotkit.common.utils.StringUtils;
 
 /**
  * 多租户redis缓存key前缀处理

iot-common/iot-common-tenant/src/main/java/cc/iotkit/common/tenant/helper/TenantHelper.java

@@ -1,19 +1,16 @@
 package cc.iotkit.common.tenant.helper;
 
+import cc.iotkit.common.constant.GlobalConstants;
+import cc.iotkit.common.redis.utils.RedisUtils;
+import cc.iotkit.common.satoken.utils.LoginHelper;
+import cc.iotkit.common.utils.SpringUtils;
+import cc.iotkit.common.utils.StringUtils;
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.spring.SpringMVCUtil;
 import cn.hutool.core.convert.Convert;
-import com.alibaba.ttl.TransmittableThreadLocal;
-import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
-import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.redis.utils.RedisUtils;
-import org.dromara.common.satoken.utils.LoginHelper;
 
 import java.util.function.Supplier;
 

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/BigNumberSerializer.java

@@ -1,4 +1,4 @@
-package cc.iotkit.common.config;
+package cc.iotkit.common.web.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/FilterConfig.java

@@ -1,10 +1,10 @@
 package cc.iotkit.common.web.config;
 
+import cc.iotkit.common.utils.StringUtils;
+import cc.iotkit.common.web.config.properties.XssProperties;
+import cc.iotkit.common.web.filter.RepeatableFilter;
+import cc.iotkit.common.web.filter.XssFilter;
 import jakarta.servlet.DispatcherType;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.web.config.properties.XssProperties;
-import org.dromara.common.web.filter.RepeatableFilter;
-import org.dromara.common.web.filter.XssFilter;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/config/JacksonConfig.java

@@ -1,4 +1,4 @@
-package cc.iotkit.common.config;
+package cc.iotkit.common.web.config;
 
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/enums/CaptchaType.java

@@ -1,10 +1,10 @@
 package cc.iotkit.common.web.enums;
 
+import cc.iotkit.common.web.utils.UnsignedMathGenerator;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.captcha.generator.RandomGenerator;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.dromara.common.web.utils.UnsignedMathGenerator;
 
 /**
  * 验证码类型

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/filter/RepeatableFilter.java

@@ -1,8 +1,8 @@
 package cc.iotkit.common.web.filter;
 
+import cc.iotkit.common.utils.StringUtils;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
-import org.dromara.common.core.utils.StringUtils;
 import org.springframework.http.MediaType;
 
 import java.io.IOException;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/filter/RepeatedlyRequestWrapper.java

@@ -1,12 +1,12 @@
 package cc.iotkit.common.web.filter;
 
+import cc.iotkit.common.constant.Constants;
 import cn.hutool.core.io.IoUtil;
 import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
-import org.dromara.common.core.constant.Constants;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/filter/XssFilter.java

@@ -1,9 +1,9 @@
 package cc.iotkit.common.web.filter;
 
+import cc.iotkit.common.utils.StringUtils;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.common.core.utils.StringUtils;
 import org.springframework.http.HttpMethod;
 
 import java.io.IOException;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/filter/XssHttpServletRequestWrapper.java

@@ -1,5 +1,6 @@
 package cc.iotkit.common.web.filter;
 
+import cc.iotkit.common.utils.StringUtils;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HtmlUtil;
@@ -7,7 +8,6 @@ import jakarta.servlet.ReadListener;
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
-import org.dromara.common.core.utils.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/interceptor/PlusWebInvokeTimeInterceptor.java

@@ -1,16 +1,15 @@
 package cc.iotkit.common.web.interceptor;
 
+import cc.iotkit.common.utils.JsonUtils;
+import cc.iotkit.common.utils.SpringUtils;
+import cc.iotkit.common.utils.StringUtils;
+import cc.iotkit.common.web.filter.RepeatedlyRequestWrapper;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;
-import com.alibaba.ttl.TransmittableThreadLocal;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.StopWatch;
-import org.dromara.common.core.utils.SpringUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
 import org.springframework.http.MediaType;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

iot-common/iot-common-web/src/main/java/cc/iotkit/common/web/utils/UnsignedMathGenerator.java

@@ -1,12 +1,10 @@
 package cc.iotkit.common.web.utils;
 
+import cc.iotkit.common.utils.StringUtils;
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.core.math.Calculator;
 import cn.hutool.core.util.CharUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.dromara.common.core.utils.StringUtils;
-
-import java.io.Serial;
 
 /**
  * 无符号计算生成器
@@ -14,8 +12,6 @@ import java.io.Serial;
  * @author Lion Li
  */
 public class UnsignedMathGenerator implements CodeGenerator {
-
-    @Serial
     private static final long serialVersionUID = -5514819971774091076L;
 
     private static final String OPERATORS = "+-*";

iot-common/iot-message-bus/iot-message-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.vertx;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.eventbus.MessageCodec;
 import io.vertx.core.json.Json;
@@ -39,7 +39,7 @@ public class BeanCodec<T> implements MessageCodec<T, T> {
 
     @Override
     public T transform(T o) {
-        return JsonUtil.parse(JsonUtil.toJsonString(o), beanType);
+        return JsonUtils.parseObject(JsonUtils.toJsonString(o), beanType);
     }
 
     @Override

iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java

@@ -1,6 +1,6 @@
 package cc.iotkit.rocketmq;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.mq.ConsumerHandler;
 import cc.iotkit.mq.MqConsumer;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +33,7 @@ public class RocketMqConsumer<T> implements MqConsumer<T> {
             consumer.subscribe(topic, "*");
             consumer.registerMessageListener((MessageListenerConcurrently) (messages, context) -> {
                 for (MessageExt message : messages) {
-                    T msg = JsonUtil.parse(new String(message.getBody(), StandardCharsets.UTF_8), msgType);
+                    T msg = JsonUtils.parseObject(new String(message.getBody(), StandardCharsets.UTF_8), msgType);
                     handler.handler(msg);
                 }
                 return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;

iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java

@@ -2,7 +2,7 @@ package cc.iotkit.rocketmq;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.mq.MqProducer;
 import org.apache.rocketmq.client.producer.DefaultMQProducer;
 import org.apache.rocketmq.common.message.Message;
@@ -27,7 +27,7 @@ public class RocketMqProducer<T> implements MqProducer<T> {
     public void publish(String topic, T msg) {
         try {
             producer.send(new Message(topic,
-                    JsonUtil.toJsonString(msg).getBytes(StandardCharsets.UTF_8)));
+                    JsonUtils.toJsonString(msg).getBytes(StandardCharsets.UTF_8)));
         } catch (Throwable e) {
             throw new BizException(ErrCode.SEND_MSG_ERROR, e);
         }

iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java

@@ -10,7 +10,7 @@
 package cc.iotkit.script;
 
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;
 import org.graalvm.polyglot.Context;
@@ -55,7 +55,7 @@ public class JavaScriptEngine implements IScriptEngine {
         StringBuilder sbArgs = new StringBuilder("[");
         //将入参转成json
         for (int i = 0; i < args.length; i++) {
-            args[i] = JsonUtil.toJsonString(args[i]);
+            args[i] = JsonUtils.toJsonString(args[i]);
             sbArgs.append(i == args.length - 1 ? "," : "").append(args[i]);
         }
         sbArgs.append("]");
@@ -71,7 +71,7 @@ public class JavaScriptEngine implements IScriptEngine {
             return null;
         }
 
-        return JsonUtil.parse(json, type);
+        return JsonUtils.parseObject(json, type);
     }
 
 }

iot-components/iot-DLT645-component/src/main/java/cc/iotkit/comp/DLT645/DLT645Component.java

@@ -11,7 +11,7 @@ package cc.iotkit.comp.DLT645;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.converter.DeviceMessage;
@@ -43,7 +43,7 @@ public class DLT645Component extends AbstractDeviceComponent {
         super.create(config);
         vertx = Vertx.vertx();
         this.id = UUID.randomUUID().toString();
-        DLT645Config DLT645Config = JsonUtil.parse(config.getOther(), DLT645Config.class);
+        DLT645Config DLT645Config = JsonUtils.parseObject(config.getOther(), DLT645Config.class);
         DLT645Verticle = new DLT645Verticle(DLT645Config);
     }
 

iot-components/iot-DLT645-component/src/main/java/cc/iotkit/comp/DLT645/DLT645Verticle.java

@@ -1,7 +1,7 @@
 package cc.iotkit.comp.DLT645;
 
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.DLT645.analysis.*;
 import cc.iotkit.comp.DLT645.utils.ByteUtils;
 import cc.iotkit.comp.DLT645.utils.ContainerUtils;
@@ -118,7 +118,7 @@ public class DLT645Verticle extends AbstractVerticle {
                     unPack.put("funCode",funCode.getCode());
                     unPack.put("identify",dataEntity.getKey());//数据标识
                     unPack.put("data",dataEntity.getValue()+dataEntity.getUnit());//数据+单位
-                    executor.onReceive(new HashMap<>(), "dlt", JsonUtil.toJsonString(unPack));
+                    executor.onReceive(new HashMap<>(), "dlt", JsonUtils.toJsonString(unPack));
                 }
             });
             socket.closeHandler(res->{

iot-components/iot-DLT645-component/src/main/java/cc/iotkit/comp/DLT645/analysis/DLT645Converter.java

@@ -2,7 +2,7 @@ package cc.iotkit.comp.DLT645.analysis;
 
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.thing.ThingService;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.common.utils.UniqueIdUtil;
 import cc.iotkit.comp.DLT645.utils.ByteUtils;
 import cc.iotkit.converter.Device;
@@ -30,7 +30,7 @@ public class DLT645Converter implements IConverter {
     @Override
     public ThingModelMessage decode(DeviceMessage msg) {
         ThingModelMessage tmm = null;
-        ReportData rd=JsonUtil.parse(JsonUtil.toJsonString(msg.getContent()),ReportData.class);
+        ReportData rd=JsonUtils.parseObject(JsonUtils.toJsonString(msg.getContent()),ReportData.class);
         if(ThingModelMessage.TYPE_PROPERTY.equals(rd.type)&&"report".equals(rd.getIdentifier())){
             tmm=ThingModelMessage.builder()
                     .mid(msg.getMid())

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceComponentManager.java

@@ -14,7 +14,7 @@ import cc.iotkit.common.ComponentClassLoader;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.thing.ThingService;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.IComponent;
 import cc.iotkit.comp.IDeviceComponent;
@@ -199,7 +199,7 @@ public class DeviceComponentManager {
     }
 
     public void send(ThingService<?> service) {
-        log.info("start exec device service:{}", JsonUtil.toJsonString(service));
+        log.info("start exec device service:{}", JsonUtils.toJsonString(service));
         if (components.size() == 0) {
             throw new BizException(ErrCode.COMPONENT_NOT_FOUND);
         }

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/DeviceMessageHandler.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.comps;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.common.utils.UniqueIdUtil;
 import cc.iotkit.comp.IDeviceComponent;
 import cc.iotkit.comp.IMessageHandler;
@@ -204,7 +204,7 @@ public class DeviceMessageHandler implements IMessageHandler {
         }
         try {
             if (Action.TYPE_ACK.equals(action.getType())) {
-                DeviceMessage deviceMessage = JsonUtil.parse(action.getContent(), DeviceMessage.class);
+                DeviceMessage deviceMessage = JsonUtils.parseObject(action.getContent(), DeviceMessage.class);
                 this.getComponent().send(deviceMessage);
             }
         } catch (Throwable e) {

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceBehaviourService.java

@@ -13,7 +13,7 @@ import cc.iotkit.common.Constants;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.DeviceUtil;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.common.utils.UniqueIdUtil;
 import cc.iotkit.comp.model.DeviceState;
 import cc.iotkit.comp.model.RegisterInfo;
@@ -136,7 +136,7 @@ public class DeviceBehaviourService {
 
         //新设备或更换网关需要产生注册消息
         if (reportMsg) {
-            log.info("device registered:{}", JsonUtil.toJsonString(device));
+            log.info("device registered:{}", JsonUtils.toJsonString(device));
             //新注册设备注册消息
             ThingModelMessage modelMessage = new ThingModelMessage(
                     UUID.randomUUID().toString(),
@@ -264,7 +264,7 @@ public class DeviceBehaviourService {
      * 提供给js调用的方法
      */
     public void reportMessage(String jsonMsg) {
-        ThingModelMessage message = JsonUtil.parse(jsonMsg, ThingModelMessage.class);
+        ThingModelMessage message = JsonUtils.parseObject(jsonMsg, ThingModelMessage.class);
         reportMessage(message);
     }
 }

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DeviceConfigConsumer.java

@@ -11,7 +11,7 @@ package cc.iotkit.comps.service;
 
 import cc.iotkit.common.Constants;
 import cc.iotkit.common.thing.ThingService;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comps.DeviceComponentManager;
 import cc.iotkit.data.manager.IDeviceConfigData;
 import cc.iotkit.model.device.DeviceConfig;
@@ -57,7 +57,7 @@ public class DeviceConfigConsumer implements ConsumerHandler<ThingModelMessage>
                     return;
                 }
 
-                Map config = JsonUtil.parse(deviceConfig.getConfig(), Map.class);
+                Map config = JsonUtils.parseObject(deviceConfig.getConfig(), Map.class);
                 ThingService<Object> service = ThingService.builder()
                         .productKey(msg.getProductKey())
                         .deviceName(msg.getDeviceName())

iot-components/iot-component-server/src/main/java/cc/iotkit/comps/service/DevicePropertyConsumer.java

@@ -10,7 +10,7 @@
 package cc.iotkit.comps.service;
 
 import cc.iotkit.common.Constants;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.data.manager.IDeviceInfoData;
 import cc.iotkit.data.manager.IThingModelData;
 import cc.iotkit.model.device.DeviceInfo;
@@ -100,7 +100,7 @@ public class DevicePropertyConsumer implements ConsumerHandler<ThingModelMessage
      */
     private void updateDeviceCurrentProperties(String deviceId, Map<String, Object> properties) {
         try {
-            log.info("save device property,deviceId:{},property:{}", deviceId, JsonUtil.toJsonString(properties));
+            log.info("save device property,deviceId:{},property:{}", deviceId, JsonUtils.toJsonString(properties));
             deviceInfoData.saveProperties(deviceId, properties);
         } catch (Throwable e) {
             log.error("save device current properties error", e);

iot-components/iot-component-tcp/src/main/java/cc/iotkit/comp/TcpDeviceComponent.java

@@ -1,7 +1,7 @@
 package cc.iotkit.comp;
 
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.model.DeviceState;
 import cc.iotkit.comp.tcp.cilent.TcpClientDeviceComponent;
 import cc.iotkit.comp.tcp.server.TcpServerDeviceComponent;
@@ -21,7 +21,7 @@ public class TcpDeviceComponent extends AbstractDeviceComponent {
 
     @Override
     public void create(CompConfig config) {
-        Map maps = JsonUtil.parse(config.getOther(), Map.class);
+        Map maps = JsonUtils.parseObject(config.getOther(), Map.class);
         String type = maps.get("type").toString();
         if ("server".equals(type)) {
             tcpVerticle = new TcpServerDeviceComponent();

iot-components/iot-component-tcp/src/main/java/cc/iotkit/comp/tcp/cilent/TcpClientDeviceComponent.java

@@ -2,7 +2,7 @@ package cc.iotkit.comp.tcp.cilent;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.model.DeviceState;
@@ -25,7 +25,7 @@ public class TcpClientDeviceComponent extends AbstractDeviceComponent {
     public void create(CompConfig config) {
         super.create(config);
         vertx = Vertx.vertx();
-        TcpClinetConfig tcpClinetConfig = JsonUtil.parse(config.getOther(), TcpClinetConfig.class);
+        TcpClinetConfig tcpClinetConfig = JsonUtils.parseObject(config.getOther(), TcpClinetConfig.class);
         tcpClientVerticle = new TcpClientVerticle(tcpClinetConfig);
     }
 

iot-components/iot-component-tcp/src/main/java/cc/iotkit/comp/tcp/server/TcpServerDeviceComponent.java

@@ -2,7 +2,7 @@ package cc.iotkit.comp.tcp.server;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.model.DeviceState;
@@ -26,7 +26,7 @@ public class TcpServerDeviceComponent extends AbstractDeviceComponent {
     public void create(CompConfig config) {
         super.create(config);
         vertx = Vertx.vertx();
-        TcpServerConfig serverConfig = JsonUtil.parse(config.getOther(), TcpServerConfig.class);
+        TcpServerConfig serverConfig = JsonUtils.parseObject(config.getOther(), TcpServerConfig.class);
         tcpServerVerticle = new TcpServerVerticle(serverConfig);
     }
 

iot-components/iot-ctwing-component/src/main/java/cc/iotkit/comp/http/CtwingDeviceComponent.java

@@ -11,7 +11,7 @@ package cc.iotkit.comp.http;
 
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.utils.CodecUtil;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.converter.DeviceMessage;
@@ -47,7 +47,7 @@ public class CtwingDeviceComponent extends AbstractDeviceComponent {
     @Override
     public void create(CompConfig config) {
         super.create(config);
-        this.ctwingConfig = JsonUtil.parse(config.getOther(), CtwingConfig.class);
+        this.ctwingConfig = JsonUtils.parseObject(config.getOther(), CtwingConfig.class);
         commandClient = AepDeviceCommandClient.newClient()
                 .appKey(ctwingConfig.getAppKey())
                 .appSecret(ctwingConfig.getAppSecret())
@@ -63,9 +63,9 @@ public class CtwingDeviceComponent extends AbstractDeviceComponent {
                 .handler(rc -> {
                     try {
                         Map<String, Object> httpHeader = ProtocolUtil.getData(rc.request().headers());
-                        log.info("request header:{}", JsonUtil.toJsonString(httpHeader));
+                        log.info("request header:{}", JsonUtils.toJsonString(httpHeader));
                         Map<String, List<Object>> httpParams = ProtocolUtil.getListData(rc.request().params());
-                        log.info("request params:{}", JsonUtil.toJsonString(httpParams));
+                        log.info("request params:{}", JsonUtils.toJsonString(httpParams));
 
                         HttpServerRequest httpRequest = rc.request();
                         String contentType = httpRequest.headers().get("Content-Type");
@@ -73,7 +73,7 @@ public class CtwingDeviceComponent extends AbstractDeviceComponent {
                         int responseCode = 500;
                         if ("application/json".equals(contentType)) {
                             requestBody = rc.getBody().toString();
-                            EncodedMessage msg = JsonUtil.parse(requestBody, EncodedMessage.class);
+                            EncodedMessage msg = JsonUtils.parseObject(requestBody, EncodedMessage.class);
                             String content = CodecUtil.aesDecrypt(ctwingConfig.getEncryptToken(), msg.getEnc_msg());
                             log.info("decrypt msg:{}", content);
                             getHandler().onReceive(httpHeader, "", content);
@@ -138,7 +138,7 @@ public class CtwingDeviceComponent extends AbstractDeviceComponent {
             throw new BizException("send cmd to ctwing error:" + body);
         }
 
-        CtwingCmdRsp cmdRsp = JsonUtil.parse(body, CtwingCmdRsp.class);
+        CtwingCmdRsp cmdRsp = JsonUtils.parseObject(body, CtwingCmdRsp.class);
         if (cmdRsp.code != 0) {
             throw new BizException("send cmd to ctwing failed:" + body);
         }

iot-components/iot-emqx-component/src/main/java/cc/iotkit/comp/emqx/EmqxDeviceComponent.java

@@ -12,7 +12,7 @@ package cc.iotkit.comp.emqx;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.thing.ThingService;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.common.utils.ThreadUtil;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
@@ -65,7 +65,7 @@ public class EmqxDeviceComponent extends AbstractDeviceComponent implements Runn
     public void create(CompConfig config) {
         super.create(config);
         vertx = Vertx.vertx();
-        mqttConfig = JsonUtil.parse(config.getOther(), EmqxConfig.class);
+        mqttConfig = JsonUtils.parseObject(config.getOther(), EmqxConfig.class);
         authVerticle = new AuthVerticle(mqttConfig);
     }
 
@@ -261,7 +261,7 @@ public class EmqxDeviceComponent extends AbstractDeviceComponent implements Runn
      */
     public Object getCompMqttClientIdList() {
         String[] result = compMqttClientIdList.toArray(new String[0]);
-        return JsonUtil.toJsonString(result);
+        return JsonUtils.toJsonString(result);
     }
 
     @Data

iot-components/iot-http-biz-component/src/main/java/cc/iotkit/comp/biz/HttpBizComponent.java

@@ -9,7 +9,7 @@
  */
 package cc.iotkit.comp.biz;
 
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.IComponent;
 import cc.iotkit.script.IScriptEngine;
@@ -50,7 +50,7 @@ public class HttpBizComponent implements IComponent {
     @Override
     public void create(CompConfig config) {
         this.id = UUID.randomUUID().toString();
-        this.httpConfig = JsonUtil.parse(config.getOther(), HttpConfig.class);
+        this.httpConfig = JsonUtils.parseObject(config.getOther(), HttpConfig.class);
         scriptEngine.setScript(script);
     }
 
@@ -62,16 +62,16 @@ public class HttpBizComponent implements IComponent {
                 .handler(rc -> {
                     try {
                         Map<String, Object> httpHeader = getData(rc.request().headers());
-                        log.info("request header:{}", JsonUtil.toJsonString(httpHeader));
+                        log.info("request header:{}", JsonUtils.toJsonString(httpHeader));
                         Map<String, List<Object>> httpParams = getListData(rc.request().params());
-                        log.info("request params:{}", JsonUtil.toJsonString(httpParams));
+                        log.info("request params:{}", JsonUtils.toJsonString(httpParams));
 
                         HttpServerRequest httpRequest = rc.request();
                         String contentType = httpRequest.headers().get("Content-Type");
                         Map<String, Object> responseHeader = new HashMap<>();
                         if ("application/json".equals(contentType)) {
                             String bodyStr = rc.getBody().toString();
-                            Map body = JsonUtil.parse(bodyStr, Map.class);
+                            Map body = JsonUtils.parseObject(bodyStr, Map.class);
                             log.info("request body:{}", bodyStr);
 
                             String response;

iot-components/iot-mqtt-component/src/main/java/cc/iotkit/comp/mqtt/MqttDeviceComponent.java

@@ -12,7 +12,7 @@ package cc.iotkit.comp.mqtt;
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
 import cc.iotkit.common.thing.ThingService;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.model.DeviceState;
@@ -43,7 +43,7 @@ public class MqttDeviceComponent extends AbstractDeviceComponent {
     public void create(CompConfig config) {
         super.create(config);
         vertx = Vertx.vertx();
-        MqttConfig mqttConfig = JsonUtil.parse(config.getOther(), MqttConfig.class);
+        MqttConfig mqttConfig = JsonUtils.parseObject(config.getOther(), MqttConfig.class);
         mqttVerticle = new MqttVerticle(mqttConfig);
     }
 

iot-components/iot-websocket-component/src/main/java/cc/iotkit/comp/websocket/WebSocketDeviceComponent.java

@@ -2,7 +2,7 @@ package cc.iotkit.comp.websocket;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.AbstractDeviceComponent;
 import cc.iotkit.comp.CompConfig;
 import cc.iotkit.comp.model.DeviceState;
@@ -31,7 +31,7 @@ public class WebSocketDeviceComponent extends AbstractDeviceComponent {
     public void create(CompConfig config) {
         super.create(config);
         vertx = Vertx.vertx();
-        String type = JsonUtil.parse(config.getOther(), Map.class).get("type").toString();
+        String type = JsonUtils.parseObject(config.getOther(), Map.class).get("type").toString();
         if(AbstractDeviceVerticle.TYPE_CLIENT.equals(type)){
             webSocketVerticle = new WebSocketClientVerticle(config.getOther());
         }else{

iot-components/iot-websocket-component/src/main/java/cc/iotkit/comp/websocket/client/WebSocketClientVerticle.java

@@ -2,7 +2,7 @@ package cc.iotkit.comp.websocket.client;
 
 import cc.iotkit.common.enums.ErrCode;
 import cc.iotkit.common.exception.BizException;
-import cc.iotkit.common.utils.JsonUtil;
+import cc.iotkit.common.utils.JsonUtils;
 import cc.iotkit.comp.model.ReceiveResult;
 import cc.iotkit.comp.model.RegisterInfo;
 import cc.iotkit.comp.websocket.AbstractDeviceVerticle;
@@ -37,7 +37,7 @@ public class WebSocketClientVerticle extends AbstractDeviceVerticle {
     }
 
     public WebSocketClientVerticle(String config) {
-        this.webSocketConfig = JsonUtil.parse(config, WebSocketClientConfig.class);
+        this.webSocketConfig = JsonUtils.parseObject(config, WebSocketClientConfig.class);
     }
 
     public void start() {
@@ -76,7 +76,7 @@ public class WebSocketClientVerticle extends AbstractDeviceVerticle {
                     if (webSocketClient.isClosed()) {
                         vertx.cancelTimer(timerID);
                     }
-                    executor.onReceive(new HashMap<>(), "ping", JsonUtil.toJsonString(webSocketConfig));
+                    executor.onReceive(new HashMap<>(), "ping", JsonUtils.toJsonString(webSocketConfig));
                 });
             }
         }).onFailure(e -> {
@@ -99,7 +99,7 @@ public class WebSocketClientVerticle extends AbstractDeviceVerticle {
         if (!(obj instanceof Map)) {
             throw new BizException(ErrCode.DATA_FORMAT_ERROR);
         }
-        String msgStr = JsonUtil.toJsonString(obj);
+        String msgStr = JsonUtils.toJsonString(obj);
         log.info("send msg payload:{}", msgStr);
         Future<Void> result = webSocketClient.writeTextMessage(msgStr);
         result.onFailure(e -> log.error("webSocket client send msg failed", e));