diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
index b16f176..a58256a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/CloudApiSampleApplication.java
@@ -4,13 +4,10 @@ import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
-@MapperScan("org.dromara.sample.*.dao")
+@MapperScan("org.dromara.sample.*.mapper")
 @EnableDubbo
-@SpringBootApplication(scanBasePackages = {"org.dromara.common.sdk.**","org.dromara.sample.**"}, exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(scanBasePackages = {"org.dromara.common.sdk.**","org.dromara.sample.**"})
 public class CloudApiSampleApplication {
 
 	public static void main(String[] args) {
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java
deleted file mode 100644
index ab303cd..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceDictionaryMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity;
-
-/**
- *
- * @author sean.zhou
- * @date 2021/11/15
- * @version 0.1
- */
-public interface IDeviceDictionaryMapper extends BaseMapper<DeviceDictionaryEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java
deleted file mode 100644
index 3043a86..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceHmsMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.DeviceHmsEntity;
-
-/**
- * @author sean
- * @version 1.1
- * @date 2022/7/6
- */
-public interface IDeviceHmsMapper extends BaseMapper<DeviceHmsEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java
deleted file mode 100644
index ea74504..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceLogsMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.DeviceLogsEntity;
-
-/**
- * @author sean
- * @version 1.2
- * @date 2022/9/7
- */
-public interface IDeviceLogsMapper extends BaseMapper<DeviceLogsEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java
deleted file mode 100644
index 0cb3338..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.DeviceEntity;
-
-/**
- *
- * @author sean.zhou
- * @date 2021/11/10
- * @version 0.1
- */
-public interface IDeviceMapper extends BaseMapper<DeviceEntity> {
-
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java
deleted file mode 100644
index a2b5c16..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDevicePayloadMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.DevicePayloadEntity;
-
-/**
- * @author sean.zhou
- * @date 2021/11/19
- * @version 0.1
- */
-public interface IDevicePayloadMapper extends BaseMapper<DevicePayloadEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java
deleted file mode 100644
index 28d0ce9..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IFirmwareModelMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.FirmwareModelEntity;
-
-/**
- * @author sean
- * @version 1.3
- * @date 2022/12/21
- */
-public interface IFirmwareModelMapper extends BaseMapper<FirmwareModelEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java
deleted file mode 100644
index ff0db4c..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileIndexMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.LogsFileIndexEntity;
-
-/**
- * @author sean
- * @version 1.2
- * @date 2022/9/8
- */
-public interface ILogsFileIndexMapper extends BaseMapper<LogsFileIndexEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java
deleted file mode 100644
index 869d1c3..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/ILogsFileMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.LogsFileEntity;
-
-/**
- * @author sean
- * @version 1.2
- * @date 2022/9/7
- */
-public interface ILogsFileMapper extends BaseMapper<LogsFileEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java
deleted file mode 100644
index 42ceb00..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IUserMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.dromara.sample.manage.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.manage.model.entity.UserEntity;
-
-public interface IUserMapper extends BaseMapper<UserEntity> {
-
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java
new file mode 100644
index 0000000..1c04c7a
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceDictionaryMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity;
+
+/**
+ *
+ * @author sean.zhou
+ * @date 2021/11/15
+ * @version 0.1
+ */
+public interface IDeviceDictionaryMapper extends BaseMapperPlus<DeviceDictionaryEntity,BaseMapperPlus> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
similarity index 87%
rename from dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java
rename to dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
index 87a055e..ac3dd19 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IDeviceFirmwareMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceFirmwareMapper.java
@@ -1,9 +1,9 @@
-package org.dromara.sample.manage.dao;
+package org.dromara.sample.manage.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.sample.manage.model.entity.DeviceFirmwareEntity;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select;
  * @version 1.2
  * @date 2022/8/16
  */
-public interface IDeviceFirmwareMapper extends BaseMapper<DeviceFirmwareEntity> {
+public interface IDeviceFirmwareMapper extends BaseMapperPlus<DeviceFirmwareEntity,DeviceFirmwareEntity> {
     String sql = "<script> \n" +
                 "SELECT \n" +
                 "  * \n" +
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java
new file mode 100644
index 0000000..e81ef9a
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceHmsMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.DeviceHmsEntity;
+
+/**
+ * @author sean
+ * @version 1.1
+ * @date 2022/7/6
+ */
+public interface IDeviceHmsMapper extends BaseMapperPlus<DeviceHmsEntity,DeviceHmsEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java
new file mode 100644
index 0000000..8a82a82
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceLogsMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.DeviceLogsEntity;
+
+/**
+ * @author sean
+ * @version 1.2
+ * @date 2022/9/7
+ */
+public interface IDeviceLogsMapper extends BaseMapperPlus<DeviceLogsEntity,DeviceLogsEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java
new file mode 100644
index 0000000..4cdc6c6
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDeviceMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.DeviceEntity;
+
+/**
+ *
+ * @author sean.zhou
+ * @date 2021/11/10
+ * @version 0.1
+ */
+public interface IDeviceMapper extends BaseMapperPlus<DeviceEntity,DeviceEntity> {
+
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java
new file mode 100644
index 0000000..09cb672
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IDevicePayloadMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.DevicePayloadEntity;
+
+/**
+ * @author sean.zhou
+ * @date 2021/11/19
+ * @version 0.1
+ */
+public interface IDevicePayloadMapper extends BaseMapperPlus<DevicePayloadEntity,DevicePayloadEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java
new file mode 100644
index 0000000..7350f98
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IFirmwareModelMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.FirmwareModelEntity;
+
+/**
+ * @author sean
+ * @version 1.3
+ * @date 2022/12/21
+ */
+public interface IFirmwareModelMapper extends BaseMapperPlus<FirmwareModelEntity,FirmwareModelEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java
new file mode 100644
index 0000000..2c03840
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileIndexMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.LogsFileIndexEntity;
+
+/**
+ * @author sean
+ * @version 1.2
+ * @date 2022/9/8
+ */
+public interface ILogsFileIndexMapper extends BaseMapperPlus<LogsFileIndexEntity,LogsFileIndexEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java
new file mode 100644
index 0000000..9f6b1b3
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/ILogsFileMapper.java
@@ -0,0 +1,12 @@
+package org.dromara.sample.manage.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.manage.model.entity.LogsFileEntity;
+
+/**
+ * @author sean
+ * @version 1.2
+ * @date 2022/9/7
+ */
+public interface ILogsFileMapper extends BaseMapperPlus<LogsFileEntity,LogsFileEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IWorkspaceMapper.java
similarity index 82%
rename from dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java
rename to dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IWorkspaceMapper.java
index aa5c221..f9bc524 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/dao/IWorkspaceMapper.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/IWorkspaceMapper.java
@@ -1,4 +1,4 @@
-package org.dromara.sample.manage.dao;
+package org.dromara.sample.manage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.sample.manage.model.entity.WorkspaceEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java
deleted file mode 100644
index c34d27e..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.dromara.sample.manage.model.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserDTO {
-
-    @JsonProperty("user_id")
-    private String userId;
-
-    private String username;
-
-    @JsonProperty("workspace_id")
-    private String workspaceId;
-
-    @JsonProperty("user_type")
-    private Integer userType;
-
-    @JsonProperty("mqtt_username")
-    private String mqttUsername;
-
-    @JsonProperty("mqtt_password")
-    private String mqttPassword;
-
-    @JsonProperty("access_token")
-    private String accessToken;
-
-    @JsonProperty("mqtt_addr")
-    private String mqttAddr;
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java
deleted file mode 100644
index 05095a3..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserListDTO.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.dromara.sample.manage.model.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-/**
- * @author sean
- * @version 1.0
- * @date 2022/4/18
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserListDTO {
-
-    private String userId;
-
-    private String username;
-
-    private String workspaceName;
-
-    private String userType;
-
-    private String mqttUsername;
-
-    private String mqttPassword;
-
-    private LocalDateTime createTime;
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java
deleted file mode 100644
index 4d2ae57..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/UserLoginDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.dromara.sample.manage.model.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.NonNull;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserLoginDTO {
-
-    @NonNull
-    private String username;
-
-    @NonNull
-    private String password;
-
-    @NonNull
-    private Integer flag;
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
index bbed940..6d4a494 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceDictionaryServiceImpl.java
@@ -1,7 +1,7 @@
 package org.dromara.sample.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.dromara.sample.manage.dao.IDeviceDictionaryMapper;
+import org.dromara.sample.manage.mapper.IDeviceDictionaryMapper;
 import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO;
 import org.dromara.sample.manage.model.entity.DeviceDictionaryEntity;
 import org.dromara.sample.manage.service.IDeviceDictionaryService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java
index fc0a247..b1afba3 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFirmwareServiceImpl.java
@@ -22,7 +22,7 @@ import org.dromara.common.sdk.mqtt.events.TopicEventsResponse;
 import org.dromara.common.websocket.dto.BizCodeEnum;
 import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
-import org.dromara.sample.manage.dao.IDeviceFirmwareMapper;
+import org.dromara.sample.manage.mapper.IDeviceFirmwareMapper;
 import org.dromara.sample.manage.model.dto.*;
 import org.dromara.sample.manage.model.entity.DeviceFirmwareEntity;
 import org.dromara.sample.manage.model.enums.UserTypeEnum;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java
index 83675f3..e115030 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceHmsServiceImpl.java
@@ -11,7 +11,7 @@ import org.dromara.common.sdk.common.PaginationData;
 import org.dromara.common.sdk.mqtt.events.TopicEventsRequest;
 import org.dromara.common.websocket.dto.BizCodeEnum;
 import org.dromara.common.websocket.utils.WebSocketUtils;
-import org.dromara.sample.manage.dao.IDeviceHmsMapper;
+import org.dromara.sample.manage.mapper.IDeviceHmsMapper;
 import org.dromara.sample.manage.model.common.HmsJsonUtil;
 import org.dromara.sample.manage.model.common.HmsMessage;
 import org.dromara.sample.manage.model.dto.DeviceDTO;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java
index 1ecd957..ebe25f2 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceLogsServiceImpl.java
@@ -22,7 +22,7 @@ import org.dromara.common.websocket.dto.BizCodeEnum;
 import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
 
-import org.dromara.sample.manage.dao.IDeviceLogsMapper;
+import org.dromara.sample.manage.mapper.IDeviceLogsMapper;
 import org.dromara.sample.manage.model.dto.*;
 import org.dromara.sample.manage.model.entity.DeviceLogsEntity;
 import org.dromara.sample.manage.model.enums.DeviceLogsStatusEnum;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java
index b07a0b4..210bd00 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DevicePayloadServiceImpl.java
@@ -7,7 +7,7 @@ import org.dromara.common.sdk.cloudapi.device.*;
 import org.dromara.common.websocket.dto.BizCodeEnum;
 import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.sample.control.model.enums.DroneAuthorityEnum;
-import org.dromara.sample.manage.dao.IDevicePayloadMapper;
+import org.dromara.sample.manage.mapper.IDevicePayloadMapper;
 import org.dromara.sample.manage.model.dto.*;
 import org.dromara.sample.manage.model.entity.DevicePayloadEntity;
 import org.dromara.sample.manage.model.enums.UserTypeEnum;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
index 453f291..0f8bef4 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
@@ -29,7 +29,7 @@ import org.dromara.common.websocket.utils.WebSocketUtils;
 import org.dromara.sample.common.error.CommonErrorEnum;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
 import org.dromara.sample.control.model.enums.DroneAuthorityEnum;
-import org.dromara.sample.manage.dao.IDeviceMapper;
+import org.dromara.sample.manage.mapper.IDeviceMapper;
 import org.dromara.sample.manage.model.dto.*;
 import org.dromara.sample.manage.model.entity.DeviceEntity;
 import org.dromara.sample.manage.model.enums.DeviceFirmwareStatusEnum;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java
index 0e4ce5d..e8191ab 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/FirmwareModelServiceImpl.java
@@ -1,6 +1,6 @@
 package org.dromara.sample.manage.service.impl;
 
-import org.dromara.sample.manage.dao.IFirmwareModelMapper;
+import org.dromara.sample.manage.mapper.IFirmwareModelMapper;
 import org.dromara.sample.manage.model.dto.FirmwareModelDTO;
 import org.dromara.sample.manage.model.entity.FirmwareModelEntity;
 import org.dromara.sample.manage.service.IFirmwareModelService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java
index 46ac64a..cfa07c3 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileIndexServiceImpl.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.dromara.common.sdk.cloudapi.log.LogFileIndex;
 import org.dromara.common.sdk.cloudapi.log.LogModuleEnum;
-import org.dromara.sample.manage.dao.ILogsFileIndexMapper;
+import org.dromara.sample.manage.mapper.ILogsFileIndexMapper;
 import org.dromara.sample.manage.model.dto.LogsFileDTO;
 import org.dromara.sample.manage.model.dto.LogsFileUploadDTO;
 import org.dromara.sample.manage.model.entity.LogsFileIndexEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java
index 4e250f7..1251589 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/LogsFileServiceImpl.java
@@ -9,7 +9,7 @@ import org.dromara.common.sdk.cloudapi.log.FileUploadProgressFile;
 import org.dromara.common.sdk.cloudapi.log.FileUploadStartFile;
 import org.dromara.common.sdk.cloudapi.log.FileUploadStatusEnum;
 import org.dromara.common.sdk.cloudapi.log.LogFileIndex;
-import org.dromara.sample.manage.dao.ILogsFileMapper;
+import org.dromara.sample.manage.mapper.ILogsFileMapper;
 import org.dromara.sample.manage.model.dto.LogsFileDTO;
 import org.dromara.sample.manage.model.dto.LogsFileUploadDTO;
 import org.dromara.sample.manage.model.entity.LogsFileEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
index 253c771..db885f6 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/WorkspaceServiceImpl.java
@@ -1,7 +1,7 @@
 package org.dromara.sample.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.dromara.sample.manage.dao.IWorkspaceMapper;
+import org.dromara.sample.manage.mapper.IWorkspaceMapper;
 import org.dromara.sample.manage.model.dto.WorkspaceDTO;
 import org.dromara.sample.manage.model.entity.WorkspaceEntity;
 import org.dromara.sample.manage.service.IWorkspaceService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java
deleted file mode 100644
index d4e5633..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IDeviceFlightAreaMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity;
-
-/**
- * @author sean
- * @version 1.9
- * @date 2023/11/23
- */
-public interface IDeviceFlightAreaMapper extends BaseMapper<DeviceFlightAreaEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java
deleted file mode 100644
index 1e6b4ac..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IElementCoordinateMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.ElementCoordinateEntity;
-
-/**
- * @author sean
- * @version 0.2
- * @date 2021/11/29
- */
-public interface IElementCoordinateMapper extends BaseMapper<ElementCoordinateEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java
deleted file mode 100644
index 4ba80f6..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaFileMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.FlightAreaFileEntity;
-
-/**
- * @author sean
- * @version 1.9
- * @date 2023/11/22
- */
-public interface IFlightAreaFileMapper extends BaseMapper<FlightAreaFileEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java
deleted file mode 100644
index d425e05..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IFlightAreaPropertyMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity;
-
-/**
- * @author sean
- * @version 1.9
- * @date 2023/11/21
- */
-public interface IFlightAreaPropertyMapper extends BaseMapper<FlightAreaPropertyEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java
deleted file mode 100644
index 0395cec..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupElementMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.GroupElementEntity;
-
-/**
- * @author sean
- * @version 0.2
- * @date 2021/11/29
- */
-public interface IGroupElementMapper extends BaseMapper<GroupElementEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java
deleted file mode 100644
index a33becc..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/dao/IGroupMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.map.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.map.model.entity.GroupEntity;
-
-/**
- * @author sean
- * @version 0.2
- * @date 2021/11/29
- */
-public interface IGroupMapper extends BaseMapper<GroupEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java
new file mode 100644
index 0000000..9e32197
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IDeviceFlightAreaMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity;
+
+/**
+ * @author sean
+ * @version 1.9
+ * @date 2023/11/23
+ */
+public interface IDeviceFlightAreaMapper extends BaseMapperPlus<DeviceFlightAreaEntity,DeviceFlightAreaEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java
new file mode 100644
index 0000000..576155c
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IElementCoordinateMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity;
+import org.dromara.sample.map.model.entity.ElementCoordinateEntity;
+
+/**
+ * @author sean
+ * @version 0.2
+ * @date 2021/11/29
+ */
+public interface IElementCoordinateMapper extends BaseMapperPlus<ElementCoordinateEntity, ElementCoordinateEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java
new file mode 100644
index 0000000..a29801e
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaFileMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.ElementCoordinateEntity;
+import org.dromara.sample.map.model.entity.FlightAreaFileEntity;
+
+/**
+ * @author sean
+ * @version 1.9
+ * @date 2023/11/22
+ */
+public interface IFlightAreaFileMapper extends BaseMapperPlus<FlightAreaFileEntity, FlightAreaFileEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java
new file mode 100644
index 0000000..cd6acbf
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IFlightAreaPropertyMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity;
+
+/**
+ * @author sean
+ * @version 1.9
+ * @date 2023/11/21
+ */
+public interface IFlightAreaPropertyMapper extends BaseMapperPlus<FlightAreaPropertyEntity,FlightAreaPropertyEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java
new file mode 100644
index 0000000..be2cf2c
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupElementMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.GroupElementEntity;
+
+/**
+ * @author sean
+ * @version 0.2
+ * @date 2021/11/29
+ */
+public interface IGroupElementMapper extends BaseMapperPlus<GroupElementEntity,GroupElementEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java
new file mode 100644
index 0000000..7737510
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/mapper/IGroupMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.map.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.map.model.entity.GroupEntity;
+
+/**
+ * @author sean
+ * @version 0.2
+ * @date 2021/11/29
+ */
+public interface IGroupMapper extends BaseMapperPlus<GroupEntity,GroupEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java
index d1502bb..84acc9d 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/DeviceFlightAreaServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.sample.map.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncReasonEnum;
 import org.dromara.common.sdk.cloudapi.flightarea.FlightAreaSyncStatusEnum;
-import org.dromara.sample.map.dao.IDeviceFlightAreaMapper;
+import org.dromara.sample.map.mapper.IDeviceFlightAreaMapper;
 import org.dromara.sample.map.model.dto.DeviceFlightAreaDTO;
 import org.dromara.sample.map.model.entity.DeviceFlightAreaEntity;
 import org.dromara.sample.map.service.IDeviceFlightAreaService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java
index 7f886f5..b2f8d85 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/ElementCoordinateServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.sample.map.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.dromara.common.sdk.cloudapi.map.ElementCoordinate;
-import org.dromara.sample.map.dao.IElementCoordinateMapper;
+import org.dromara.sample.map.mapper.IElementCoordinateMapper;
 import org.dromara.sample.map.model.entity.ElementCoordinateEntity;
 import org.dromara.sample.map.service.IElementCoordinateService;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java
index 6e6613c..5f4b909 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaFileServiceImpl.java
@@ -1,13 +1,12 @@
 package org.dromara.sample.map.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.oss.core.OssClient;
 import org.dromara.common.oss.factory.OssFactory;
 import org.dromara.common.sdk.cloudapi.flightarea.*;
 import org.dromara.common.sdk.cloudapi.map.ElementCircleGeometry;
 import org.dromara.common.sdk.cloudapi.map.ElementPointGeometry;
-import org.dromara.sample.map.dao.IFlightAreaFileMapper;
+import org.dromara.sample.map.mapper.IFlightAreaFileMapper;
 import org.dromara.sample.map.model.dto.FlightAreaDTO;
 import org.dromara.sample.map.model.dto.FlightAreaFileDTO;
 import org.dromara.sample.map.model.entity.FlightAreaFileEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java
index 85733cb..4f4ceec 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/FlightAreaPropertyServiceImpl.java
@@ -3,7 +3,7 @@ package org.dromara.sample.map.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.common.sdk.cloudapi.flightarea.GeofenceTypeEnum;
 import org.dromara.common.sdk.cloudapi.flightarea.GeometrySubTypeEnum;
-import org.dromara.sample.map.dao.IFlightAreaPropertyMapper;
+import org.dromara.sample.map.mapper.IFlightAreaPropertyMapper;
 import org.dromara.sample.map.model.dto.FlightAreaPropertyDTO;
 import org.dromara.sample.map.model.dto.FlightAreaPropertyUpdate;
 import org.dromara.sample.map.model.entity.FlightAreaPropertyEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java
index 0a4d7eb..8790f95 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupElementServiceImpl.java
@@ -2,7 +2,7 @@ package org.dromara.sample.map.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.common.sdk.cloudapi.map.*;
-import org.dromara.sample.map.dao.IGroupElementMapper;
+import org.dromara.sample.map.mapper.IGroupElementMapper;
 import org.dromara.sample.map.model.dto.GroupElementDTO;
 import org.dromara.sample.map.model.entity.GroupElementEntity;
 import org.dromara.sample.map.service.IElementCoordinateService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java
index 2b92327..a42798d 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/map/service/impl/GroupServiceImpl.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.common.sdk.cloudapi.map.GetMapElementsResponse;
 import org.dromara.common.sdk.cloudapi.map.GroupTypeEnum;
-import org.dromara.sample.map.dao.IGroupMapper;
+import org.dromara.sample.map.mapper.IGroupMapper;
 import org.dromara.sample.map.model.entity.GroupEntity;
 import org.dromara.sample.map.service.IGroupElementService;
 import org.dromara.sample.map.service.IGroupService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java
deleted file mode 100644
index a72564f..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/dao/IFileMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.media.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.media.model.MediaFileEntity;
-
-/**
- * @author sean
- * @version 0.2
- * @date 2021/12/9
- */
-public interface IFileMapper extends BaseMapper<MediaFileEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java
new file mode 100644
index 0000000..88a7922
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/mapper/IFileMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.media.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.media.model.MediaFileEntity;
+
+/**
+ * @author sean
+ * @version 0.2
+ * @date 2021/12/9
+ */
+public interface IFileMapper extends BaseMapperPlus<MediaFileEntity,MediaFileEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
index b74e370..6a77a49 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
@@ -11,7 +11,7 @@ import org.dromara.common.sdk.common.Pagination;
 import org.dromara.common.sdk.common.PaginationData;
 import org.dromara.sample.manage.model.dto.DeviceDictionaryDTO;
 import org.dromara.sample.manage.service.IDeviceDictionaryService;
-import org.dromara.sample.media.dao.IFileMapper;
+import org.dromara.sample.media.mapper.IFileMapper;
 import org.dromara.sample.media.model.MediaFileDTO;
 import org.dromara.sample.media.model.MediaFileEntity;
 import org.dromara.sample.media.service.IFileService;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java
deleted file mode 100644
index bab0f86..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineFileMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.wayline.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
-
-/**
- * @author sean
- * @version 0.3
- * @date 2021/12/22
- */
-public interface IWaylineFileMapper extends BaseMapper<WaylineFileEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java
deleted file mode 100644
index f2b1f67..0000000
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/dao/IWaylineJobMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.dromara.sample.wayline.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
-
-/**
- * @author sean
- * @version 1.1
- * @date 2022/6/1
- */
-public interface IWaylineJobMapper extends BaseMapper<WaylineJobEntity> {
-}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
new file mode 100644
index 0000000..393e729
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineFileMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.sample.wayline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
+
+/**
+ * @author sean
+ * @version 0.3
+ * @date 2021/12/22
+ */
+public interface IWaylineFileMapper extends BaseMapperPlus<WaylineFileEntity,WaylineFileEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java
new file mode 100644
index 0000000..e941956
--- /dev/null
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/mapper/IWaylineJobMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.sample.wayline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
+import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
+
+/**
+ * @author sean
+ * @version 1.1
+ * @date 2022/6/1
+ */
+public interface IWaylineJobMapper extends BaseMapperPlus<WaylineJobEntity, WaylineFileEntity> {
+}
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
index aa16927..128f72c 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import jodd.util.StringUtil;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Node;
@@ -20,7 +19,7 @@ import org.dromara.common.sdk.cloudapi.wayline.GetWaylineListResponse;
 import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum;
 import org.dromara.common.sdk.common.Pagination;
 import org.dromara.common.sdk.common.PaginationData;
-import org.dromara.sample.wayline.dao.IWaylineFileMapper;
+import org.dromara.sample.wayline.mapper.IWaylineFileMapper;
 import org.dromara.sample.wayline.model.dto.KmzFileProperties;
 import org.dromara.sample.wayline.model.dto.WaylineFileDTO;
 import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 49f8d7c..280feaf 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -18,7 +18,7 @@ import org.dromara.sample.manage.service.IDeviceRedisService;
 import org.dromara.sample.manage.service.IDeviceService;
 import org.dromara.sample.media.model.MediaFileCountDTO;
 import org.dromara.sample.media.service.IFileService;
-import org.dromara.sample.wayline.dao.IWaylineJobMapper;
+import org.dromara.sample.wayline.mapper.IWaylineJobMapper;
 import org.dromara.sample.wayline.model.dto.WaylineJobDTO;
 import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
 import org.dromara.sample.wayline.model.enums.WaylineJobStatusEnum;
diff --git a/dk-modules/sample/src/main/resources/application.yml b/dk-modules/sample/src/main/resources/application.yml
index 278b097..9f82ea4 100644
--- a/dk-modules/sample/src/main/resources/application.yml
+++ b/dk-modules/sample/src/main/resources/application.yml
@@ -12,11 +12,6 @@ spring:
     # 环境配置
     active: @profiles.active@
 
-cloud-sdk:
-  mqtt:
-    # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".
-    inbound-topic: sys/product/+/status,thing/product/+/requests
-
 --- # nacos 配置
 spring:
   cloud: