From cf49f4f936a11b27de3f9ec3cbb50603f3b1cd5b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:16:18 +0800
Subject: [PATCH] merge

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysDictDataServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 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..aee4bec 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,12 +1,24 @@
 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.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;
 
 /**
  * 字典 业务层处理
@@ -14,10 +26,12 @@
  * @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;
 
     /**
      * 根据条件分页查询字典数据
@@ -108,4 +122,24 @@
         }
         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);
+        }
+    }
 }

--
Gitblit v1.7.1