From 20a96aac79984138ea2db11f61291f1aab955c45 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 14:00:45 +0800 Subject: [PATCH] =?UTF-8?q?Service=E5=92=8Cmapper=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?:=20=E4=B8=9A=E5=8A=A1Mapper=E7=B1=BB=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=BB=A7=E6=89=BFHisBaseMapper,=E4=B8=94=E5=8A=A0=E4=B8=8A@Tab?= =?UTF-8?q?leName=E6=B3=A8=E8=A7=A3=E6=8C=87=E5=AE=9A=E8=A1=A8=E5=90=8D=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1Service=20extends=20HisBaseService=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1ServiceImpl=20extends=20HisBaseServiceImpl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/biz/HisBaseMapper.java | 6 ++-- .../com/core/common/biz/HisBaseService.java | 33 +++++++++++++++++++ .../core/common/biz/HisBaseServiceImpl.java | 24 ++++++++++++++ .../medication/mapper/MedicationMapper.java | 5 ++- .../service/IMedicationService.java | 8 ++--- .../service/impl/MedicationServiceImpl.java | 3 +- 6 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java create mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java index cb6eaadb..90e919c1 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java @@ -1,7 +1,7 @@ package com.core.common.biz; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Param; @@ -31,7 +31,7 @@ public interface HisBaseMapper extends BaseMapper { /** * 根据 UpdateWrapper 逻辑删除记录 */ - default int logicalDelByWrapper(UpdateWrapper updateWrapper) { + default int logicalDelByWrapper(LambdaUpdateWrapper updateWrapper) { String tableName = getTableName(); return logicalDelByWrapper(updateWrapper, tableName); } @@ -50,7 +50,7 @@ public interface HisBaseMapper extends BaseMapper { int logicalDelByIds(@Param("tableName") String tableName, @Param("ids") List ids); @Update("UPDATE ${tableName} SET delete_flag = 1 ${ew.customSqlSegment}") - int logicalDelByWrapper(@Param(Constants.WRAPPER) UpdateWrapper updateWrapper, @Param("tableName") String tableName); + int logicalDelByWrapper(@Param(Constants.WRAPPER) LambdaUpdateWrapper updateWrapper, @Param("tableName") String tableName); /** * 获取表名 diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java new file mode 100644 index 00000000..86efb579 --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java @@ -0,0 +1,33 @@ +package com.core.common.biz; + +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +public interface HisBaseService extends IService { + + /** + * 根据ID逻辑删除单条记录 + * + * @param id 主键ID + * @return 是否成功 + */ + boolean logicalDelById(Long id); + + /** + * 根据ID列表批量逻辑删除记录 + * + * @param ids 主键ID列表 + * @return 是否成功 + */ + boolean logicalDelByIds(List ids); + + /** + * 根据条件逻辑删除记录 + * + * @param updateWrapper 更新条件（Lambda形式） + * @return 是否成功 + */ + boolean logicalDelByWrapper(LambdaUpdateWrapper updateWrapper); +} \ No newline at end of file diff --git a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java new file mode 100644 index 00000000..7b4a1ce0 --- /dev/null +++ b/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java @@ -0,0 +1,24 @@ +package com.core.common.biz; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +public class HisBaseServiceImpl, T> extends ServiceImpl implements HisBaseService { + + @Override + public boolean logicalDelById(Long id) { + return ((HisBaseMapper) baseMapper).logicalDelById(id) > 0; + } + + @Override + public boolean logicalDelByIds(List ids) { + return ((HisBaseMapper) baseMapper).logicalDelByIds(ids) > 0; + } + + @Override + public boolean logicalDelByWrapper(LambdaUpdateWrapper updateWrapper) { + return ((HisBaseMapper) baseMapper).logicalDelByWrapper(updateWrapper) > 0; + } +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java index 4f28c7cc..f0476f2d 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java @@ -1,5 +1,7 @@ package com.openhis.medication.mapper; +import com.baomidou.mybatisplus.annotation.TableName; +import com.core.common.biz.HisBaseMapper; import com.openhis.medication.domain.MedicationDetail; import org.springframework.stereotype.Repository; @@ -14,8 +16,9 @@ import java.util.List; * @author system * @date 2025-02-20 */ +@TableName("med_medication") @Repository -public interface MedicationMapper extends BaseMapper { +public interface MedicationMapper extends HisBaseMapper { /** * 查询药品详细信息列表 diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java index 96cd7038..4aa04c4e 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java @@ -1,18 +1,18 @@ package com.openhis.medication.service; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.IService; +import com.core.common.biz.HisBaseService; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDetail; +import java.util.List; + /** * 药品基本信息管理Service接口 * * @author system * @date 2025-02-20 */ -public interface IMedicationService extends IService { +public interface IMedicationService extends HisBaseService { /** * 查询药品信息列表 diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java index 4f709ad5..91d46c28 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java @@ -2,6 +2,7 @@ package com.openhis.medication.service.impl; import java.util.List; +import com.core.common.biz.HisBaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Service -public class MedicationServiceImpl extends ServiceImpl implements IMedicationService { +public class MedicationServiceImpl extends HisBaseServiceImpl implements IMedicationService { @Autowired private MedicationMapper medicationMapper;