diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java index a9aa8c6..538cb1d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/LocalDatabaseController.java @@ -14,13 +14,13 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.database.dto.NasaDataRecordPage; -import org.jeecg.modules.database.entity.LocalDatabase; +import org.jeecg.modules.database.entity.*; import org.jeecg.modules.database.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import java.util.Arrays; +import java.util.*; /** * @Description: 当期数据库记录 @@ -62,6 +62,22 @@ public class LocalDatabaseController extends JeecgController> search(@RequestParam(name = "kw") String keyWord, HttpServletRequest req) { + List localDatabaseList = localDatabaseService.search(keyWord); + List historicalDatabaseList = historicalDatabaseService.search(keyWord); + List nasaDataRecordList = nasaDataRecordService.search(keyWord); + + List result = new ArrayList<>(); + + result.addAll(localDatabaseList); + result.addAll(historicalDatabaseList); + result.addAll(nasaDataRecordList); + + return Result.OK(result); + } + /** * 添加 * diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/DatabaseSearchDTO.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/DatabaseSearchDTO.java new file mode 100644 index 0000000..b1fdd76 --- /dev/null +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/DatabaseSearchDTO.java @@ -0,0 +1,20 @@ +/* + * Ant Group + * Copyright (c) 2004-2025 All Rights Reserved. + */ +package org.jeecg.modules.database.dto; + +import lombok.*; + +/** + * @author lise + * @version DatabaseSearchDTO.java, v 0.1 2025年04月02日 22:21 lise + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DatabaseSearchDTO { + private String id; + private String type; + private E result; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java index af8cddd..2c9f941 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/HistoricalDatabase.java @@ -32,6 +32,10 @@ public class HistoricalDatabase implements Serializable { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private String id; + + @TableField(exist = false) + private String dataType="historical"; + /** * 创建人 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java index 0ca2453..3cb2ce0 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/LocalDatabase.java @@ -32,6 +32,9 @@ public class LocalDatabase implements Serializable { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private String id; + + @TableField(exist = false) + private String dataType="local"; /** * 创建人 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java index 56e7534..ac34d0d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/NasaDataRecord.java @@ -33,6 +33,8 @@ public class NasaDataRecord implements Serializable { @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private String id; + @TableField(exist = false) + private String dataType="nasa"; /** * 创建人 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java index b1a3408..ef785fc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/HistoricalDatabaseMapper.java @@ -1,9 +1,12 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.HistoricalDatabase; +import java.util.List; + /** * @Description: 历史一期记录 * @Author: jeecg-boot @@ -18,4 +21,5 @@ public interface HistoricalDatabaseMapper extends BaseMapper @Select("SELECT SUM(total_count_xhy) FROM historical_database where total_count_xhy is not null") Long sumXhy(); + List search(@Param("keyWord") String keyWord); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java index d74ebda..a069241 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/LocalDatabaseMapper.java @@ -1,9 +1,12 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.LocalDatabase; +import java.util.List; + /** * @Description: 当期数据库记录 * @Author: jeecg-boot @@ -16,4 +19,6 @@ public interface LocalDatabaseMapper extends BaseMapper { @Select("SELECT SUM(total_count_xhy) FROM local_database where total_count_xhy is not null") Long sumXhy(); + + List search(@Param("keyWord") String keyWord); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java index 071874f..de852c9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/NasaDataRecordMapper.java @@ -1,9 +1,12 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.jeecg.modules.database.entity.NasaDataRecord; +import java.util.List; + /** * @Description: NASA数据管理 * @Author: jeecg-boot @@ -17,4 +20,6 @@ public interface NasaDataRecordMapper extends BaseMapper { @Select("SELECT SUM(total_count_nasa) FROM nasa_data_record where total_count_nasa is not null") Long sumXhy(); + + List search(@Param("keyWord") String keyWord); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml index 4f27377..95ff7d9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/HistoricalDatabaseMapper.xml @@ -2,4 +2,18 @@ + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml index b360c27..03bc382 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/LocalDatabaseMapper.xml @@ -1,5 +1,57 @@ - + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/NasaDataRecordMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/NasaDataRecordMapper.xml index 3e5708c..b06265e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/NasaDataRecordMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/NasaDataRecordMapper.xml @@ -2,4 +2,18 @@ + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java index 392f01d..4120d12 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IHistoricalDatabaseService.java @@ -2,6 +2,9 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.HistoricalDatabase; +import org.jeecg.modules.database.entity.LocalDatabase; + +import java.util.List; /** * @Description: 历史一期记录 @@ -13,4 +16,6 @@ public interface IHistoricalDatabaseService extends IService Long sumLhs(); Long sumXhy(); + List search(String keyWord); + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java index beb4bec..370a8bf 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/ILocalDatabaseService.java @@ -1,8 +1,11 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.database.dto.DatabaseSearchDTO; import org.jeecg.modules.database.entity.LocalDatabase; +import java.util.List; + /** * @Description: 当期数据库记录 * @Author: jeecg-boot @@ -13,4 +16,6 @@ public interface ILocalDatabaseService extends IService { Long sumLhs(); Long sumXhy(); + + List search(String keyWord); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/INasaDataRecordService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/INasaDataRecordService.java index ea0f6fb..9765168 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/INasaDataRecordService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/INasaDataRecordService.java @@ -3,6 +3,8 @@ package org.jeecg.modules.database.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.NasaDataRecord; +import java.util.List; + /** * @Description: NASA数据管理 * @Author: jeecg-boot @@ -14,4 +16,7 @@ public interface INasaDataRecordService extends IService { Long sumLhs(); Long sumXhy(); + + List search(String keyWord); + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java index c2209b2..c34d8ec 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/HistoricalDatabaseServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.modules.database.mapper.HistoricalDatabaseMapper; import org.jeecg.modules.database.service.IHistoricalDatabaseService; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Optional; /** @@ -27,4 +28,9 @@ public class HistoricalDatabaseServiceImpl extends ServiceImpl search(String keyWord) { + return baseMapper.search(keyWord); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java index 5de0f75..bdc2b29 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/LocalDatabaseServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.modules.database.mapper.LocalDatabaseMapper; import org.jeecg.modules.database.service.ILocalDatabaseService; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Optional; /** @@ -16,6 +17,7 @@ import java.util.Optional; */ @Service public class LocalDatabaseServiceImpl extends ServiceImpl implements ILocalDatabaseService { + @Override public Long sumLhs() { return Optional.ofNullable(baseMapper.sumLhs()).orElse(0L); @@ -25,4 +27,9 @@ public class LocalDatabaseServiceImpl extends ServiceImpl search(String keyWord) { + return baseMapper.search(keyWord); + } } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/NasaDataRecordServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/NasaDataRecordServiceImpl.java index 06999b0..c7fe8e9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/NasaDataRecordServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/NasaDataRecordServiceImpl.java @@ -6,6 +6,7 @@ import org.jeecg.modules.database.mapper.NasaDataRecordMapper; import org.jeecg.modules.database.service.INasaDataRecordService; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Optional; /** @@ -27,4 +28,9 @@ public class NasaDataRecordServiceImpl extends ServiceImpl search(String keyWord) { + return baseMapper.search(keyWord); + } }