From 94bea76d832307a5d23ef5acfc545efc120cbaba Mon Sep 17 00:00:00 2001 From: ls Date: Sat, 22 Feb 2025 13:57:23 +0800 Subject: [PATCH] update --- .../controller/ExperimentController.java | 22 +++++++--------- .../modules/database/entity/Experiment.java | 2 +- .../database/mapper/ExperimentMapper.java | 3 +++ .../database/mapper/xml/ExperimentMapper.xml | 25 +++++++++++++++++++ .../database/service/IExperimentService.java | 4 +++ .../service/impl/ExperimentServiceImpl.java | 8 ++++++ 6 files changed, 50 insertions(+), 14 deletions(-) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java index 2ed346c..33d9691 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java @@ -1,9 +1,7 @@ package org.jeecg.modules.database.controller; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -15,8 +13,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; 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.common.system.query.QueryRuleEnum; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.modules.database.constant.ExperimentStatus; import org.jeecg.modules.database.entity.*; @@ -85,17 +81,17 @@ public class ExperimentController extends JeecgController> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - Map customeRuleMap = new HashMap<>(); + //Map customeRuleMap = new HashMap<>(); // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR - customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE); - - Map parameterMap = req.getParameterMap(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap); + //customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE); + // + //Map parameterMap = req.getParameterMap(); + //QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, parameterMap, customeRuleMap); Page page = new Page<>(pageNo, pageSize); - if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) { - page.addOrder(OrderItem.asc("index_no")); - } - IPage pageList = experimentService.page(page, queryWrapper); + //if (!parameterMap.containsKey("column") || StringUtils.isBlank(parameterMap.get("column")[0])) { + // page.addOrder(OrderItem.asc("index_no")); + //} + IPage pageList = experimentService.join(page, experiment, null); pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v)); return Result.OK(pageList); } 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 1bdc11b..739bde8 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 @@ -195,7 +195,7 @@ public class Experiment implements Serializable { @TableField(exist = false) private String sampleName; @TableField(exist = false) - private String equipmentMode; + private String equipmentModel; private String sampleModel; //@TableField(exist = false) diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java index ceea9b3..57e63b4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/ExperimentMapper.java @@ -1,6 +1,8 @@ package org.jeecg.modules.database.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.modules.database.entity.Experiment; /** @@ -11,4 +13,5 @@ import org.jeecg.modules.database.entity.Experiment; */ public interface ExperimentMapper extends BaseMapper { + IPage join(Page page, Experiment experiment); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml index 15f9cd3..064a61e 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml @@ -2,4 +2,29 @@ + + \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java index 737b778..9d4fef2 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IExperimentService.java @@ -1,5 +1,8 @@ package org.jeecg.modules.database.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.database.entity.Experiment; @@ -21,4 +24,5 @@ public interface IExperimentService extends IService { Integer getLastIndex(); + IPage join(Page page, Experiment experiment, QueryWrapper queryWrapper); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index 86e91a4..29dabc1 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -4,6 +4,9 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.jeecg.modules.database.constant.ExperimentStatus; @@ -270,4 +273,9 @@ public class ExperimentServiceImpl extends ServiceImpl join(Page page, Experiment experiment, QueryWrapper queryWrapper) { + return baseMapper.join(page, experiment); + } }