From 8e4fb974d2bb5edd0feac39b735b7514cd3f4f3c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期日, 24 七月 2022 10:22:46 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java
index 47d9e55..a7d4069 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BcDictionaryServiceImpl.java
@@ -1,26 +1,37 @@
package com.panzhihua.service_community.service.impl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.BcDictionaryItemVO;
import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.CopyUtil;
+import com.panzhihua.service_community.dao.BcDictionaryDAO;
import com.panzhihua.service_community.dao.BcDictionaryItemDAO;
+import com.panzhihua.service_community.model.dos.BcDictionaryDO;
import com.panzhihua.service_community.model.dos.BcDictionaryItemDO;
import com.panzhihua.service_community.service.BcDictionaryService;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* @author xyh
* @date 2021/6/11 16:06
*/
@Service
-public class BcDictionaryServiceImpl extends ServiceImpl<BcDictionaryItemDAO, BcDictionaryItemDO> implements BcDictionaryService {
+public class BcDictionaryServiceImpl extends ServiceImpl<BcDictionaryItemDAO, BcDictionaryItemDO>
+ implements BcDictionaryService {
+ @Resource
+ private BcDictionaryDAO dictionaryDAO;
@Override
public R<List<BcDictionaryVO>> getDictionaryByKey(String key) {
@@ -38,14 +49,66 @@
@Override
public BcDictionaryItemVO getByCode(String dictId, String code) {
- BcDictionaryItemDO dictionaryItemDO = baseMapper.selectOne(
- new QueryWrapper<BcDictionaryItemDO>()
- .eq("dict_id", dictId)
- .eq("dict_value", code)
- );
+ BcDictionaryItemDO dictionaryItemDO =
+ baseMapper.selectOne(new QueryWrapper<BcDictionaryItemDO>().eq("dict_id", dictId).eq("dict_value", code));
if (dictionaryItemDO != null) {
return CopyUtil.copyProperties(dictionaryItemDO, BcDictionaryItemVO.class);
}
return null;
}
+
+ @Override
+ public BcDictionaryDO getDictionaryByCode(String dictName, String dictKey, Long parentId) {
+ return dictionaryDAO.selectOne(new QueryWrapper<BcDictionaryDO>().eq("dict_name", dictName)
+ .eq("dict_key", dictKey).eq("parent_id", parentId));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R insertDiction(DictionaryVO dictionaryVO) {
+ if (getDictionaryByCode(dictionaryVO.getDictName(), dictionaryVO.getDictKey(),
+ dictionaryVO.getParentId()) != null) {
+ return R.fail("数据已经存在！");
+ }
+ BcDictionaryDO dictionaryDO = new BcDictionaryDO();
+ dictionaryDO.setId(dictionaryVO.getId());
+ dictionaryDO.setDictName(dictionaryVO.getDictName());
+ dictionaryDO.setDictKey(dictionaryVO.getDictKey());
+ dictionaryDO.setParentId(dictionaryVO.getParentId());
+ dictionaryDO
+ .setPathId(dictionaryVO.getParentId().toString().concat(",").concat(dictionaryVO.getId().toString()));
+ dictionaryDO.setLevelIndex(dictionaryVO.getLevelIndex());
+ dictionaryDO.setEnabled(true);
+ dictionaryDO.setSort(0);
+ dictionaryDO.setRemarks("");
+ dictionaryDO.setDeleteFlag(false);
+ dictionaryDO.setCreateUser(1L);
+ dictionaryDO.setModifyUser(1L);
+ int flag = dictionaryDAO.insert(dictionaryDO);
+ return flag > 1 ? R.ok() : R.fail();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R insertDictionItem(BcDictionaryVO dictionaryVO) {
+ if (getByCode(dictionaryVO.getDictId().toString(), dictionaryVO.getDictValue()) != null) {
+ return R.fail("数据已经存在！");
+ }
+ BcDictionaryItemDO dictionaryItemDO = new BcDictionaryItemDO();
+ dictionaryItemDO.setDictItemName(dictionaryVO.getDictName());
+ dictionaryItemDO.setDictValue(dictionaryVO.getDictValue());
+ dictionaryItemDO.setMnemonicCode(dictionaryVO.getCode());
+ dictionaryItemDO.setDictId(dictionaryVO.getDictId());
+ dictionaryItemDO.setEnabled(true);
+ dictionaryItemDO.setOrgPathId(0L);
+ dictionaryItemDO.setSort(0);
+ dictionaryItemDO.setRemarks("");
+ dictionaryItemDO.setCreateUser(1L);
+ dictionaryItemDO.setCreateDate(new Date());
+ dictionaryItemDO.setModifyUser(1L);
+ dictionaryItemDO.setModifyDate(new Date());
+ dictionaryItemDO.setDeleteFlag(false);
+ int flag = baseMapper.insert(dictionaryItemDO);
+ return flag > 1 ? R.ok() : R.fail();
+ }
}
--
Gitblit v1.7.1