wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete_flag修改

Browse Source
This commit is contained in:
Wang.Huan
2025-02-21 16:38:45 +08:00
parent a886e765f4
commit 4b4ed11679
7 changed files with 13 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseMapper.java
View File

@@ -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<T> extends BaseMapper<T> {
/**
* 根据ID逻辑删除单条记录
*/
default int logicalDelById(Long id) {
String tableName = getTableName();
return logicalDelById(tableName, id);
}
/**
* 根据ID列表批量逻辑删除记录
*/
default int logicalDelByIds(List<Long> ids) {
String tableName = getTableName();
return logicalDelByIds(tableName, ids);
}
/**
* 根据 UpdateWrapper 逻辑删除记录
*/
default int logicalDelByWrapper(LambdaUpdateWrapper<T> 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({
"<script>",
"UPDATE ${tableName} SET delete_flag = 1 WHERE id IN",
"<foreach collection='ids' item='id' open='(' separator=',' close=')'>",
"#{id}",
"</foreach>",
"</script>"
})
int logicalDelByIds(@Param("tableName") String tableName, @Param("ids") List<Long> ids);
@Update("UPDATE ${tableName} SET delete_flag = 1 ${ew.customSqlSegment}")
int logicalDelByWrapper(@Param(Constants.WRAPPER) LambdaUpdateWrapper<T> 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();
}
}

33
openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseService.java
View File

@@ -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<T> extends IService<T> {
/**
* 根据ID逻辑删除单条记录
*
* @param id 主键ID
* @return 是否成功
*/
boolean logicalDelById(Long id);
/**
* 根据ID列表批量逻辑删除记录
*
* @param ids 主键ID列表
* @return 是否成功
*/
boolean logicalDelByIds(List<Long> ids);
/**
* 根据条件逻辑删除记录
*
* @param updateWrapper 更新条件（Lambda形式）
* @return 是否成功
*/
boolean logicalDelByWrapper(LambdaUpdateWrapper<T> updateWrapper);
}

24
openhis-server/core-common/src/main/java/com/core/common/biz/HisBaseServiceImpl.java
View File

@@ -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<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements HisBaseService<T> {
@Override
public boolean logicalDelById(Long id) {
return ((HisBaseMapper<T>) baseMapper).logicalDelById(id) > 0;
}
@Override
public boolean logicalDelByIds(List<Long> ids) {
return ((HisBaseMapper<T>) baseMapper).logicalDelByIds(ids) > 0;
}
@Override
public boolean logicalDelByWrapper(LambdaUpdateWrapper<T> updateWrapper) {
return ((HisBaseMapper<T>) baseMapper).logicalDelByWrapper(updateWrapper) > 0;
}
}

4
openhis-server/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java
View File

@@ -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;
}

10
openhis-server/openhis-domain/src/main/java/com/openhis/medication/mapper/MedicationMapper.java
View File

@@ -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<Medication> {
public interface MedicationMapper extends BaseMapper<Medication> {
/**
* 查询药品详细信息列表

4
openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/IMedicationService.java
View File

@@ -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<Medication> {
public interface IMedicationService extends IService<Medication> {
/**
* 查询药品信息列表

13
openhis-server/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java
View File

@@ -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<MedicationMapper, Medication> implements IMedicationService {
public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medication> implements IMedicationService {
@Autowired
private MedicationMapper medicationMapper;