From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 01 一月 2025 10:13:18 +0800 Subject: [PATCH] merge --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 89 insertions(+), 13 deletions(-) diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java index 6696aa3..0687962 100644 --- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java +++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java @@ -1,27 +1,42 @@ package com.sinata.system.service.impl; -import java.util.List; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sinata.common.core.domain.entity.SysDictData; +import com.sinata.common.core.domain.entity.SysDictType; +import com.sinata.common.entity.BasePage; +import com.sinata.common.entity.PageDTO; +import com.sinata.common.exception.ServiceException; +import com.sinata.common.utils.BeanUtils; +import com.sinata.common.utils.DictUtils; +import com.sinata.system.domain.dto.SysDictDataDTO; +import com.sinata.system.domain.vo.SysDictDataVO; +import com.sinata.system.mapper.SysDictDataMapper; +import com.sinata.system.mapper.SysDictTypeMapper; +import com.sinata.system.service.ISysDictDataService; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.sinata.common.core.domain.entity.SysDictData; -import com.sinata.common.utils.DictUtils; -import com.sinata.system.mapper.SysDictDataMapper; -import com.sinata.system.service.ISysDictDataService; + +import java.util.List; +import java.util.Objects; /** * 字典 业务层处理 - * + * * @author ruoyi */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService +public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements ISysDictDataService { @Autowired private SysDictDataMapper dictDataMapper; + @Autowired + private SysDictTypeMapper dictTypeMapper; /** * 根据条件分页查询字典数据 - * + * * @param dictData 字典数据信息 * @return 字典数据集合信息 */ @@ -33,7 +48,7 @@ /** * 根据字典类型和字典键值查询字典数据信息 - * + * * @param dictType 字典类型 * @param dictValue 字典键值 * @return 字典标签 @@ -46,7 +61,7 @@ /** * 根据字典数据ID查询信息 - * + * * @param dictCode 字典数据ID * @return 字典数据 */ @@ -58,7 +73,7 @@ /** * 批量删除字典数据信息 - * + * * @param dictCodes 需要删除的字典数据ID */ @Override @@ -75,7 +90,7 @@ /** * 新增保存字典数据信息 - * + * * @param data 字典数据信息 * @return 结果 */ @@ -93,7 +108,7 @@ /** * 修改保存字典数据信息 - * + * * @param data 字典数据信息 * @return 结果 */ @@ -108,4 +123,65 @@ } return row; } + + @Override + public PageDTO<SysDictDataVO> pageList(BasePage page) { + Page<SysDictData> result = this.lambdaQuery().page(new Page<>(page.getPageCurr(), page.getPageSize())); + return PageDTO.of(result, SysDictDataVO.class); + } + + @Override + public void save(SysDictDataDTO dto) { + SysDictData sysDictData = BeanUtils.copyBean(dto, SysDictData.class); + SysDictType sysDictType = dictTypeMapper.selectDictTypeByType(dto.getDictType()); + if (Objects.isNull(sysDictType)) { + throw new ServiceException("字典类型不存在"); + } + if (Objects.nonNull(sysDictData.getDictCode())) { + baseMapper.updateById(sysDictData); + } else { + baseMapper.insert(sysDictData); + } + } + + @Override + public List<SysDictDataVO> medicalWasteTypeList() { + return getSysDictDataVOListByType("medical_waste_type"); + } + + @Nullable + private List<SysDictDataVO> getSysDictDataVOListByType(String dictType) { + List<SysDictData> medicalWasteTypeList = lambdaQuery().eq(SysDictData::getDictType, dictType).list(); + return BeanUtils.copyToList(medicalWasteTypeList, SysDictDataVO.class); + } + + /** + * 器具类型列表 + * + * @return + */ + @Override + public List<SysDictDataVO> equipmentTypeList() { + return getSysDictDataVOListByType("protection_equipment_type"); + } + + /** + * 规章制度类型列表 + * + * @return + */ + @Override + public List<SysDictDataVO> regulationsTypeList() { + return getSysDictDataVOListByType("protection_regulation_type"); + } + + /** + * 作业类型 + * + * @return + */ + @Override + public List<SysDictDataVO> workTypeList() { + return getSysDictDataVOListByType("protective_work_type"); + } } -- Gitblit v1.7.1