From 4b4ed11679f8870fb7e7e2ea245842335255f5b9 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Fri, 21 Feb 2025 16:38:45 +0800 Subject: [PATCH] =?UTF-8?q?delete=5Fflag=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/core/common/biz/HisBaseMapper.java | 66 ------------------- .../com/core/common/biz/HisBaseService.java | 33 ---------- .../core/common/biz/HisBaseServiceImpl.java | 24 ------- .../common/core/domain/HisBaseEntity.java | 4 +- .../medication/mapper/MedicationMapper.java | 10 +-- .../service/IMedicationService.java | 4 +- .../service/impl/MedicationServiceImpl.java | 13 ++-- 7 files changed, 13 insertions(+), 141 deletions(-) delete mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java delete mode 100644 openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java delete 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 deleted file mode 100644 index 0522ea48..00000000 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.core.common.biz; - -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.toolkit.Constants; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Update; -import org.springframework.core.annotation.AnnotationUtils; - -import java.util.List; - -public interface HisBaseMapper extends BaseMapper { - - /** - * 根据ID逻辑删除单条记录 - */ - default int logicalDelById(Long id) { - String tableName = getTableName(); - return logicalDelById(tableName, id); - } - - /** - * 根据ID列表批量逻辑删除记录 - */ - default int logicalDelByIds(List ids) { - String tableName = getTableName(); - return logicalDelByIds(tableName, ids); - } - - /** - * 根据 UpdateWrapper 逻辑删除记录 - */ - default int logicalDelByWrapper(LambdaUpdateWrapper updateWrapper) { - String tableName = getTableName(); - return logicalDelByWrapper(updateWrapper, tableName); - } - - @Update("UPDATE ${tableName} SET delete_flag = 1 WHERE id = #{id}") - int logicalDelById(@Param("tableName") String tableName, @Param("id") Long id); - - @Update({ - "" - }) - int logicalDelByIds(@Param("tableName") String tableName, @Param("ids") List ids); - - @Update("UPDATE ${tableName} SET delete_flag = 1 ${ew.customSqlSegment}") - int logicalDelByWrapper(@Param(Constants.WRAPPER) LambdaUpdateWrapper updateWrapper, @Param("tableName") String tableName); - - /** - * 获取表名 - */ - default String getTableName() { - TableName tableNameAnnotation = AnnotationUtils.findAnnotation(this.getClass(), TableName.class); - if (tableNameAnnotation == null) { - throw new RuntimeException("Table name annotation not found on Mapper interface"); - } - return tableNameAnnotation.value(); - } - -} 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 deleted file mode 100644 index 86efb579..00000000 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index 7b4a1ce0..00000000 --- a/openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -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/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index 3caca9c0..3dc0a6ea 100644 --- a/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -6,6 +6,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -41,6 +42,7 @@ public class HisBaseEntity implements Serializable { private Integer tenantId; /** 删除标识 */ - private Integer deleteFlag; + @TableLogic(value = "0", delval = "1") // 0 为未删除，1 为删除 + private String deleteFlag; } 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 f0476f2d..138d1b74 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,12 +1,9 @@ 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; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.openhis.medication.domain.Medication; +import com.openhis.medication.domain.MedicationDetail; +import org.springframework.stereotype.Repository; import java.util.List; @@ -16,9 +13,8 @@ import java.util.List; * @author system * @date 2025-02-20 */ -@TableName("med_medication") @Repository -public interface MedicationMapper extends HisBaseMapper { +public interface MedicationMapper extends BaseMapper { /** * 查询药品详细信息列表 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 4aa04c4e..0b04d26f 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,6 +1,6 @@ package com.openhis.medication.service; -import com.core.common.biz.HisBaseService; +import com.baomidou.mybatisplus.extension.service.IService; import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDetail; @@ -12,7 +12,7 @@ import java.util.List; * @author system * @date 2025-02-20 */ -public interface IMedicationService extends HisBaseService { +public interface IMedicationService extends IService { /** * 查询药品信息列表 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 91d46c28..b75fc2c5 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 @@ -1,11 +1,5 @@ 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; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.openhis.common.enums.DelFlag; @@ -13,8 +7,11 @@ import com.openhis.medication.domain.Medication; import com.openhis.medication.domain.MedicationDetail; import com.openhis.medication.mapper.MedicationMapper; import com.openhis.medication.service.IMedicationService; - import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 药品基本信息管理Service业务层处理 @@ -24,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @Service -public class MedicationServiceImpl extends HisBaseServiceImpl implements IMedicationService { +public class MedicationServiceImpl extends ServiceImpl implements IMedicationService { @Autowired private MedicationMapper medicationMapper;