From 9294cdbc3ffb9701400c8502dd417565bcc01d8f Mon Sep 17 00:00:00 2001 From: ls Date: Sat, 22 Feb 2025 13:35:09 +0800 Subject: [PATCH] update --- .../java/org/jeecg/common/api/vo/Result.java | 8 +++++- .../controller/NasaDataRecordController.java | 25 +++++++++++++------ .../database/dto/NasaDataRecordPage.java | 23 +++++++++++++++++ .../modules/database/entity/Experiment.java | 14 +++++------ .../database/entity/NasaDataRecord.java | 4 +-- 5 files changed, 57 insertions(+), 17 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/NasaDataRecordPage.java diff --git a/physical-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/physical-base-core/src/main/java/org/jeecg/common/api/vo/Result.java index d3a93d8..462db28 100644 --- a/physical-base-core/src/main/java/org/jeecg/common/api/vo/Result.java +++ b/physical-base-core/src/main/java/org/jeecg/common/api/vo/Result.java @@ -44,11 +44,16 @@ public class Result implements Serializable { @Schema(description = "返回数据对象") private T result; + private Object xhyCount; + private Object lhsCount; /** + * 不返回数据 + * + * @return /** * 时间戳 */ @Schema(description = "时间戳") - private long timestamp = System.currentTimeMillis(); + private long timestamp = System.currentTimeMillis(); public Result() { } @@ -128,6 +133,7 @@ public class Result implements Serializable { return r; } + public static Result OK(String msg, T data) { Result r = new Result(); r.setSuccess(true); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java index c30bf0a..6cb6f7d 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/NasaDataRecordController.java @@ -16,6 +16,7 @@ import org.jeecg.common.api.vo.Result; 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.NasaDataRecord; import org.jeecg.modules.database.service.INasaDataRecordService; import org.springframework.beans.factory.annotation.Autowired; @@ -50,14 +51,16 @@ public class NasaDataRecordController extends JeecgController> queryPageList(NasaDataRecord nasaDataRecord, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result queryPageList(NasaDataRecord nasaDataRecord, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nasaDataRecord, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = nasaDataRecordService.page(page, queryWrapper); - pageList.getRecords().forEach(nr -> { + long totalCountLhs = 0; + long totalCountXhy = 0; + for (NasaDataRecord nr : pageList.getRecords()) { String fileList = nr.getFileList(); if (StringUtils.isNotBlank(fileList)) { List> list = JSON.parseObject(fileList, new TypeReference<>() {}); @@ -65,8 +68,16 @@ public class NasaDataRecordController extends JeecgController pageList; + private long lhsCount; + private long lhsTotal; + private long xhyCount; + private long xyhTotal; +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index 8bfd3a6..1bdc11b 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecgframework.poi.excel.annotation.ExcelCollection; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -113,12 +112,6 @@ public class Experiment implements Serializable { //@Excel(name = "辐射源类型", width = 15) @Schema(description = "辐射源类型") private String radiationSourceType; - /** - * 样品型号 - */ - //@Excel(name = "样品型号", width = 15) - @Schema(description = "样品型号") - private String sampleModel; /** * 试验负责人 */ @@ -197,6 +190,13 @@ public class Experiment implements Serializable { @TableField(exist = false) private List experimentUserList; + @TableField(exist = false) + private String sampleType; + @TableField(exist = false) + private String sampleName; + @TableField(exist = false) + private String equipmentMode; + private String sampleModel; //@TableField(exist = false) //@ExcelCollection(name = "辐照") 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 1b7ebbe..d3b49d0 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 @@ -121,13 +121,13 @@ public class NasaDataRecord implements Serializable { */ @Excel(name = "西核院统计", width = 15) @Schema(description = "西核院统计") - private String totalCountNasa; + private long totalCountNasa; /** * 理化所统计 */ @Excel(name = "理化所统计", width = 15) @Schema(description = "理化所统计") - private String totalCountLhs; + private long totalCountLhs; /** * 附件IDs */