全部

src/main/java/com/yj/earth/business/controller/GraphHopperController.java

@@ -171,7 +171,6 @@ public class GraphHopperController {
 
             // 用新实例计算路径
             GHResponse response = currentHopper.route(ghRequest);
-
             // 处理错误
             if (response.hasErrors()) {
                 // 检查是否有超出范围的错误
@@ -219,7 +218,6 @@ public class GraphHopperController {
         // 配置基础参数
         hopper.setOSMFile(osmFilePath);
         hopper.setGraphHopperLocation(graphHopperProperties.getGraphLocation());
-
         // 配置交通方式 + 权重策略
         List<Profile> profileList = new ArrayList<>();
         for (String profileName : graphHopperProperties.getProfiles()) {
@@ -261,7 +259,7 @@ public class GraphHopperController {
         System.out.println("删除旧地图目录: " + graphDir.getAbsolutePath() + " → " + (dirDeleted ? "成功" : "失败"));
     }
 
-    // 重载: 递归删除子目录
+    // 重载:递归删除子目录
     private void deleteOldGraphDir(File subDir) {
         File[] files = subDir.listFiles();
         if (files != null) {

src/main/java/com/yj/earth/business/controller/MatterController.java

@@ -0,0 +1,73 @@
+package com.yj.earth.business.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yj.earth.business.domain.Matter;
+import com.yj.earth.business.service.MatterService;
+import com.yj.earth.common.util.ApiResponse;
+import com.yj.earth.dto.matter.AddMatterDto;
+import com.yj.earth.dto.matter.UpdateMatterDto;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Tag(name = "物资数据管理")
+@RestController
+@RequestMapping("/matter")
+public class MatterController {
+    @Resource
+    private MatterService matterService;
+
+    @PostMapping("/add")
+    @Operation(summary = "添加物资")
+    public ApiResponse add(@RequestBody AddMatterDto addMatterDto) {
+        Matter matter = new Matter();
+        BeanUtils.copyProperties(addMatterDto, matter);
+        matterService.save(matter);
+        return ApiResponse.success(null);
+    }
+
+    @Operation(summary = "删除物资")
+    @PostMapping("/deletes")
+    public ApiResponse deletes(@Parameter(description = "物资ID列表") @RequestBody List<String> ids) {
+        matterService.removeByIds(ids);
+        return ApiResponse.success(null);
+    }
+
+    @Operation(summary = "更新物资")
+    @PostMapping("/update")
+    public ApiResponse update(@RequestBody UpdateMatterDto updateMatterDto) {
+        Matter matter = new Matter();
+        BeanUtils.copyProperties(updateMatterDto, matter);
+        matterService.updateById(matter);
+        return ApiResponse.success(null);
+    }
+
+    @Operation(summary = "物资详情")
+    @PostMapping("/detail")
+    public ApiResponse detail(@Parameter(description = "物资ID") @RequestParam(value = "物资ID") String id) {
+        Matter matter = matterService.getById(id);
+        return ApiResponse.success(matter);
+    }
+
+    @Operation(summary = "物资列表")
+    @PostMapping("/list")
+    public ApiResponse list(@Parameter(description = "分页数量") Integer pageNum,
+                            @Parameter(description = "分页大小") Integer pageSize,
+                            @Parameter(description = "物资名称") String name) {
+        LambdaQueryWrapper<Matter> queryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(name)) {
+            queryWrapper.like(Matter::getName, name);
+        }
+        Page<Matter> page = new Page<>(pageNum, pageSize);
+        List<Matter> matterList = matterService.list(page, queryWrapper);
+        return ApiResponse.success(matterList);
+    }
+}

src/main/java/com/yj/earth/business/controller/PoiController.java

@@ -35,36 +35,37 @@ public class PoiController {
 
     @GetMapping("/data")
     @Operation(summary = "查看数据")
-    public ApiResponse data(@Parameter(description = "分页页码") Integer pageNum, @Parameter(description = "分页大小") Integer pageSize, @Parameter(description = "名称搜索") String name) {
+    public ApiResponse data(@Parameter(description = "分页页码") Integer pageNum,
+                            @Parameter(description = "分页大小") Integer pageSize,
+                            @Parameter(description = "名称搜索") String name) {
         int offset = (pageNum - 1) * pageSize;
-        StringBuilder dataSql = new StringBuilder("SELECT id, name, address, lng, lat FROM tbl_pois WHERE 1=1");
+        StringBuilder dataSql = new StringBuilder("SELECT id, name, lng, lat FROM data WHERE 1=1");
         List<Object> params = new ArrayList<>();
+
         // 添加名称搜索条件
         if (name != null && !name.trim().isEmpty()) {
             dataSql.append(" AND name LIKE ?");
             params.add("%" + name.trim() + "%");
         }
+
         // 添加分页条件
         dataSql.append(" LIMIT ? OFFSET ?");
         try {
-            // 执行数据查询、获取List
             List<PoiVo> poiList = new ArrayList<>();
             long dataStartTime = System.currentTimeMillis();
             try (PreparedStatement dataPs = connection.prepareStatement(dataSql.toString())) {
-                // 设置参数（搜索条件 + 分页参数）
                 int paramIndex = 1;
                 for (Object param : params) {
                     dataPs.setObject(paramIndex++, param);
                 }
                 dataPs.setInt(paramIndex++, pageSize);
                 dataPs.setInt(paramIndex++, offset);
-                // 处理结果集、填充List
+
                 try (ResultSet dataRs = dataPs.executeQuery()) {
                     while (dataRs.next()) {
                         PoiVo poi = new PoiVo();
                         poi.setId(dataRs.getLong("id"));
                         poi.setName(dataRs.getString("name"));
-                        poi.setAddress(dataRs.getString("address"));
                         poi.setLng(dataRs.getString("lng"));
                         poi.setLat(dataRs.getString("lat"));
                         poiList.add(poi);

src/main/java/com/yj/earth/business/controller/PoiInfoController.java

@@ -12,11 +12,11 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
+import org.sqlite.JDBC;
 
 import javax.annotation.Resource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
+import java.io.File;
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,7 +96,7 @@ public class PoiInfoController {
         }
         String path = poiInfo.getPath();
         // 构建查询SQL
-        StringBuilder dataSql = new StringBuilder("SELECT id, name, address, lng, lat FROM tbl_pois WHERE 1=1");
+        StringBuilder dataSql = new StringBuilder("SELECT id, name, lng, lat FROM data WHERE 1=1");
         List<Object> params = new ArrayList<>();
         // 名称搜索条件
         if (name != null && !name.trim().isEmpty()) {
@@ -106,7 +106,7 @@ public class PoiInfoController {
         // 分页条件
         dataSql.append(" LIMIT ? OFFSET ?");
         // 执行查询
-        try (Connection connection = SQLiteUtil.getConnection(path);
+        try (Connection connection = getConnectionByAbsolutePath(path);
              PreparedStatement dataPs = connection.prepareStatement(dataSql.toString())) {
             // 设置参数
             int paramIndex = 1;
@@ -122,7 +122,6 @@ public class PoiInfoController {
                     PoiVo poi = new PoiVo();
                     poi.setId(dataRs.getLong("id"));
                     poi.setName(dataRs.getString("name"));
-                    poi.setAddress(dataRs.getString("address"));
                     poi.setLng(dataRs.getString("lng"));
                     poi.setLat(dataRs.getString("lat"));
                     poiList.add(poi);
@@ -134,4 +133,33 @@ public class PoiInfoController {
             return ApiResponse.failure("POI数据查询失败：" + e.getMessage());
         }
     }
+
+
+    /**
+     * 根据绝对路径获取SQLite数据库连接
+     */
+    public static Connection getConnectionByAbsolutePath(String absolutePath) throws SQLException {
+        if (absolutePath == null || absolutePath.trim().isEmpty()) {
+            throw new SQLException("数据库文件路径不能为空");
+        }
+        File dbFile = new File(absolutePath.trim());
+        if (!dbFile.exists()) {
+            throw new SQLException("数据库文件不存在：" + absolutePath);
+        }
+        if (!dbFile.isFile()) {
+            throw new SQLException("路径指向的不是文件：" + absolutePath);
+        }
+        if (!dbFile.canRead()) {
+            throw new SQLException("没有权限读取数据库文件：" + absolutePath);
+        }
+        try {
+            Class.forName(JDBC.class.getName());
+        } catch (ClassNotFoundException e) {
+            throw new SQLException("SQLite驱动加载失败、请检查依赖是否正确", e);
+        }
+
+        String jdbcUrl = "jdbc:sqlite:" + absolutePath;
+        Connection connection = DriverManager.getConnection(jdbcUrl);
+        return connection;
+    }
 }

src/main/java/com/yj/earth/business/controller/SystemController.java

@@ -1,24 +1,35 @@
 package com.yj.earth.business.controller;
 
+import cn.hutool.core.lang.UUID;
+import com.yj.earth.business.domain.Source;
+import com.yj.earth.business.service.SourceService;
 import com.yj.earth.common.util.ApiResponse;
-import com.yj.earth.datasource.DatabaseManager;
 import com.yj.earth.dto.system.UpdateSystemServiceDto;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+import org.sqlite.JDBC;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
 
+import javax.annotation.Resource;
 import java.io.*;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
+import java.sql.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import static com.yj.earth.common.constant.GlobalConstant.SHOW;
 
 @Tag(name = "系统服务管理")
 @RestController
@@ -27,6 +38,8 @@ public class SystemController {
 
     @Value("${server.port}")
     private Integer serverPort;
+    @Resource
+    private SourceService sourceService;
 
     private static final String CONFIG_FILE_PATH = "application.yml";
 
@@ -86,48 +99,202 @@ public class SystemController {
         }
     }
 
-    @Operation(summary = "工程导出")
-    @GetMapping("/export")
-    public void exportProject(HttpServletResponse response) {
-        // 获取 SQLite 文件绝对路径
-        String sqliteFilePath = DatabaseManager.getSqliteDbFilePath();
-        // 校验路径与文件有效性
-        if (sqliteFilePath == null || sqliteFilePath.isEmpty()) {
-            handleError(response, HttpStatus.BAD_REQUEST.value(), "SQLite数据库未初始化");
-            return;
-        }
-        File sqliteFile = new File(sqliteFilePath);
-        if (!sqliteFile.exists()) {
-            handleError(response, HttpStatus.NOT_FOUND.value(), "SQLite文件不存在");
-            return;
-        }
-        if (!sqliteFile.canRead()) {
-            handleError(response, HttpStatus.FORBIDDEN.value(), "无权限读取SQLite文件");
-            return;
-        }
-        // 配置下载响应头（让浏览器触发下载而非打开）
-        response.setContentType("application/octet-stream");
-        response.setContentLengthLong(sqliteFile.length());
-        // 处理文件名编码
-        String fileName = URLEncoder.encode("app.db", StandardCharsets.UTF_8);
-        response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
-        response.setBufferSize(1024 * 8); // 设置响应缓冲区（提升传输效率）
-        // 读取文件流并写入响应
-        try (InputStream inputStream = new BufferedInputStream(new FileInputStream(sqliteFile));
-             OutputStream outputStream = new BufferedOutputStream(response.getOutputStream())) {
-            byte[] buffer = new byte[1024 * 8];
-            int len;
-            // 循环读取文件内容并写入响应流
-            while ((len = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, len);
+    @PostMapping("/importProjectConfig")
+    @Operation(summary = "导入项目配置")
+    public ApiResponse importProjectConfig(@RequestParam("path") String zipPath) throws SQLException, IOException {
+        File tempDir = Files.createTempDirectory("project_config_temp").toFile();
+        File sqliteFile = null;
+        try {
+            sqliteFile = unzipAndGetSqlite(zipPath, tempDir.getAbsolutePath());
+            String sqliteFilePath = sqliteFile.getAbsolutePath();
+            String fileName = Paths.get(zipPath).getFileName().toString();
+
+            // 创建新的总根节点
+            Source parentSource = new Source();
+            parentSource.setId(UUID.randomUUID().toString(true));
+            parentSource.setSourceName(fileName);
+            parentSource.setTreeIndex(0);
+            parentSource.setSourceType("folder");
+            parentSource.setIsShow(SHOW);
+            sourceService.save(parentSource);
+            String newParentId = parentSource.getId();
+
+            // 连接SQLite并读取原始节点列表
+            Connection connection = getConnectionByAbsolutePath(sqliteFilePath);
+            List<Source> originalSourceList = getSourceList(connection, newParentId);
+
+            // 过滤不需要的节点
+            List<Source> filteredList = originalSourceList.stream()
+                    .filter(source -> !fileName.equals(source.getSourceName()))
+                    .collect(Collectors.toList());
+
+            // 生成新ID
+            Map<String, String> originalIdToNewId = new HashMap<>();
+            for (Source source : filteredList) {
+                String newId = UUID.randomUUID().toString(true);
+                originalIdToNewId.put(source.getId(), newId);
+                source.setId(newId);
+            }
+
+            // 基于映射表重构父子关系
+            List<Source> processedList = filteredList.stream().map(source -> {
+                String originalParentId = source.getParentId();
+
+                if (originalParentId != null && !originalParentId.trim().isEmpty() && originalIdToNewId.containsKey(originalParentId)) {
+                    // 父节点在导入数据中：用新ID关联
+                    source.setParentId(originalIdToNewId.get(originalParentId));
+                } else {
+                    // 父节点不在导入数据中：挂到总根节点
+                    source.setParentId(newParentId);
+                }
+                return source;
+            }).collect(Collectors.toList());
+
+            // 批量保存
+            sourceService.saveBatch(processedList);
+            return ApiResponse.success(null);
+        } finally {
+            if (tempDir.exists()) {
+                deleteDirectory(tempDir);
             }
-            // 强制刷新缓冲区、确保所有数据发送到前端
-            response.flushBuffer();
-        } catch (IOException e) {
-            handleError(response, HttpStatus.INTERNAL_SERVER_ERROR.value(), "文件下载失败：" + e.getMessage());
         }
     }
 
+    private List<Source> getSourceList(Connection connection, String unusedParentId) throws SQLException {
+        List<Source> sourceList = new ArrayList<>();
+        String sql = "SELECT id, source_name, source_type, source_path, parent_id, " +
+                "tree_index, is_show, detail, params, created_at, updated_at " +
+                "FROM source";
+        DateTimeFormatter timeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+
+        try (Statement statement = connection.createStatement();
+             ResultSet resultSet = statement.executeQuery(sql)) {
+
+            while (resultSet.next()) {
+                Source source = new Source();
+                source.setId(resultSet.getString("id"));
+                source.setSourceName(resultSet.getString("source_name"));
+                source.setSourceType(resultSet.getString("source_type"));
+                source.setSourcePath(resultSet.getString("source_path"));
+
+                // 关键修改：读取原始parent_id，而非覆盖为新父节点ID
+                source.setParentId(resultSet.getString("parent_id"));
+
+                Integer treeIndex = resultSet.getObject("tree_index") != null
+                        ? resultSet.getInt("tree_index")
+                        : null;
+                source.setTreeIndex(treeIndex);
+                Integer isShow = resultSet.getObject("is_show") != null
+                        ? resultSet.getInt("is_show")
+                        : null;
+                source.setIsShow(isShow);
+                source.setDetail(resultSet.getString("detail"));
+                source.setParams(resultSet.getString("params"));
+
+                // 时间处理（保持不变）
+                String createdAtStr = resultSet.getString("created_at");
+                if (createdAtStr != null && !createdAtStr.trim().isEmpty()) {
+                    try {
+                        source.setCreatedAt(LocalDateTime.parse(createdAtStr, timeFormatter));
+                    } catch (DateTimeParseException e) {
+                        source.setCreatedAt(null);
+                    }
+                } else {
+                    source.setCreatedAt(null);
+                }
+
+                String updatedAtStr = resultSet.getString("updated_at");
+                if (updatedAtStr != null && !updatedAtStr.trim().isEmpty()) {
+                    try {
+                        source.setUpdatedAt(LocalDateTime.parse(updatedAtStr, timeFormatter));
+                    } catch (DateTimeParseException e) {
+                        source.setUpdatedAt(null);
+                    }
+                } else {
+                    source.setUpdatedAt(null);
+                }
+
+                sourceList.add(source);
+            }
+        } finally {
+            if (connection != null && !connection.isClosed()) {
+                connection.close();
+            }
+        }
+
+        return sourceList;
+    }
+
+
+    /**
+     * 解压ZIP文件并获取SQLite文件
+     */
+    private File unzipAndGetSqlite(String zipPath, String destDir) throws IOException {
+        File zipFile = new File(zipPath);
+        // 校验ZIP文件是否存在
+        if (!zipFile.exists() || !zipFile.isFile()) {
+            throw new FileNotFoundException("ZIP文件不存在或不是有效文件: " + zipPath);
+        }
+
+        File sqliteFile = null;
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile))) {
+            ZipEntry entry;
+            while ((entry = zis.getNextEntry()) != null) {
+                File destFile = new File(destDir, entry.getName());
+
+                // 处理目录条目
+                if (entry.isDirectory()) {
+                    destFile.mkdirs();
+                    continue;
+                }
+
+                // 确保父目录存在
+                if (!destFile.getParentFile().exists()) {
+                    destFile.getParentFile().mkdirs();
+                }
+
+                // 写入文件内容
+                try (FileOutputStream fos = new FileOutputStream(destFile)) {
+                    byte[] buffer = new byte[1024];
+                    int len;
+                    while ((len = zis.read(buffer)) > 0) {
+                        fos.write(buffer, 0, len);
+                    }
+                }
+
+                String fileName = destFile.getName().toLowerCase();
+                if (fileName.endsWith(".db") || fileName.endsWith(".sqlite")) {
+                    if (sqliteFile != null) {
+                        throw new IOException("ZIP文件中包含多个SQLite文件、无法确定目标文件");
+                    }
+                    sqliteFile = destFile;
+                }
+
+                zis.closeEntry();
+            }
+        }
+
+        if (sqliteFile == null) {
+            throw new IOException("ZIP文件中未找到SQLite文件（.db或.sqlite后缀）");
+        }
+
+        return sqliteFile;
+    }
+
+    /**
+     * 递归删除目录及内部文件
+     */
+    private void deleteDirectory(File dir) {
+        if (dir.isDirectory()) {
+            File[] files = dir.listFiles();
+            if (files != null) {
+                for (File file : files) {
+                    deleteDirectory(file);
+                }
+            }
+        }
+        dir.delete();
+    }
 
     /**
      * 返回指定状态码与错误信息
@@ -142,4 +309,32 @@ public class SystemController {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 根据绝对路径获取SQLite数据库连接
+     */
+    public static Connection getConnectionByAbsolutePath(String absolutePath) throws SQLException {
+        if (absolutePath == null || absolutePath.trim().isEmpty()) {
+            throw new SQLException("数据库文件路径不能为空");
+        }
+        File dbFile = new File(absolutePath.trim());
+        if (!dbFile.exists()) {
+            throw new SQLException("数据库文件不存在：" + absolutePath);
+        }
+        if (!dbFile.isFile()) {
+            throw new SQLException("路径指向的不是文件：" + absolutePath);
+        }
+        if (!dbFile.canRead()) {
+            throw new SQLException("没有权限读取数据库文件：" + absolutePath);
+        }
+        try {
+            Class.forName(JDBC.class.getName());
+        } catch (ClassNotFoundException e) {
+            throw new SQLException("SQLite驱动加载失败、请检查依赖是否正确", e);
+        }
+
+        String jdbcUrl = "jdbc:sqlite:" + absolutePath;
+        Connection connection = DriverManager.getConnection(jdbcUrl);
+        return connection;
+    }
 }

src/main/java/com/yj/earth/business/domain/Matter.java

@@ -0,0 +1,41 @@
+package com.yj.earth.business.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 周志雄
+ * @since 2025-10-30
+ */
+@Getter
+@Setter
+@Accessors(chain = true)
+@Schema(name = "Matter", description = "")
+public class Matter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    private String name;
+
+    private Integer num;
+
+    @TableField(fill = FieldFill.INSERT)
+    private String createdAt;
+
+    @TableField(fill = FieldFill.UPDATE)
+    private String updatedAt;
+}

src/main/java/com/yj/earth/business/mapper/MatterMapper.java

@@ -0,0 +1,18 @@
+package com.yj.earth.business.mapper;
+
+import com.yj.earth.business.domain.Matter;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 周志雄
+ * @since 2025-10-30
+ */
+@Mapper
+public interface MatterMapper extends BaseMapper<Matter> {
+
+}

src/main/java/com/yj/earth/business/service/MatterService.java

@@ -0,0 +1,16 @@
+package com.yj.earth.business.service;
+
+import com.yj.earth.business.domain.Matter;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 周志雄
+ * @since 2025-10-30
+ */
+public interface MatterService extends IService<Matter> {
+
+}

src/main/java/com/yj/earth/business/service/impl/MatterServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yj.earth.business.service.impl;
+
+import com.yj.earth.business.domain.Matter;
+import com.yj.earth.business.mapper.MatterMapper;
+import com.yj.earth.business.service.MatterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 周志雄
+ * @since 2025-10-30
+ */
+@Service
+public class MatterServiceImpl extends ServiceImpl<MatterMapper, Matter> implements MatterService {
+
+}

src/main/java/com/yj/earth/business/service/impl/SourceServiceImpl.java

@@ -251,7 +251,7 @@ public class SourceServiceImpl extends ServiceImpl<SourceMapper, Source> impleme
 
         // 处理分页和总数
         if (pageNum != null && pageSize != null) {
-            // 分页时，查询条件排除directory类型
+            // 分页时、查询条件排除directory类型
             sourceQueryWrapper.ne(Source::getSourceType, "directory");
             // 分页查询：获取分页数据
             Page<Source> page = new Page<>(pageNum, pageSize);