From 8498476226c599f6c2b4f24a25b2476238cd48a8 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Fri, 26 Apr 2024 12:00:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=92=8C=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/etl/domain/AssetDataDict.java | 3 ++ .../java/com/muyu/etl/domain/DictInfo.java | 5 ++- .../impl/AssetDataDictServiceImpl.java | 13 ++++-- .../etl/service/impl/DictInfoServiceImpl.java | 44 ++++++++++--------- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetDataDict.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetDataDict.java index b85330c..58056fe 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetDataDict.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/AssetDataDict.java @@ -1,5 +1,7 @@ package com.muyu.etl.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; @@ -22,6 +24,7 @@ public class AssetDataDict extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) private Long id; /** 数据接入id */ diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/DictInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/DictInfo.java index 421fd92..2102ae7 100644 --- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/DictInfo.java +++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/DictInfo.java @@ -1,5 +1,7 @@ package com.muyu.etl.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonKey; @@ -26,10 +28,11 @@ public class DictInfo extends BaseEntity private static final long serialVersionUID = 1L; /** 主键 */ + @TableId(value = "id",type = IdType.AUTO) private Long id; /** 接入id */ - @Excel(name = "接入id") + @Excel(name = "字典id") private Long dictId; /** 字典名称 */ diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetDataDictServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetDataDictServiceImpl.java index d1dbc19..873f80d 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetDataDictServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetDataDictServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; import com.muyu.etl.domain.DictInfo; @@ -64,11 +64,18 @@ public class AssetDataDictServiceImpl extends ServiceImpl(AssetDataDict.class) {{ + AssetDataDict one = this.getOne(new LambdaQueryWrapper(AssetDataDict.class) {{ + eq(AssetDataDict::getDictType, assetDataDict.getDictType()); + eq(AssetDataDict::getBasicId, assetDataDict.getBasicId()); + }}); + if (one!=null){ + throw new ServletException("该字典已存在"); + } + boolean b = this.saveOrUpdate(assetDataDict, new LambdaUpdateWrapper(AssetDataDict.class) {{ eq(AssetDataDict::getDictType,assetDataDict.getDictType()); eq(AssetDataDict::getBasicId,assetDataDict.getBasicId()); }}); - if (!b)throw new ServletException("该字典已存在"); + return b; } diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/DictInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/DictInfoServiceImpl.java index 41c9986..0dd4498 100644 --- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/DictInfoServiceImpl.java +++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/DictInfoServiceImpl.java @@ -1,18 +1,18 @@ package com.muyu.etl.service.impl; -import java.util.List; - -import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.DateUtils; +import com.muyu.etl.domain.DictInfo; +import com.muyu.etl.mapper.DictInfoMapper; +import com.muyu.etl.service.DictInfoService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.muyu.etl.mapper.DictInfoMapper; -import com.muyu.etl.domain.DictInfo; -import com.muyu.etl.service.DictInfoService; import javax.servlet.ServletException; +import java.util.List; /** * 字典详细内容Service业务层处理 @@ -22,8 +22,7 @@ import javax.servlet.ServletException; */ @Log4j2 @Service -public class DictInfoServiceImpl extends ServiceImpl implements DictInfoService -{ +public class DictInfoServiceImpl extends ServiceImpl implements DictInfoService { @Autowired private DictInfoMapper dictInfoMapper; @@ -34,8 +33,7 @@ public class DictInfoServiceImpl extends ServiceImpl im * @return 字典详细内容 */ @Override - public DictInfo selectDictInfoById(Long id) - { + public DictInfo selectDictInfoById(Long id) { return dictInfoMapper.selectDictInfoById(id); } @@ -46,8 +44,7 @@ public class DictInfoServiceImpl extends ServiceImpl im * @return 字典详细内容 */ @Override - public List selectDictInfoList(DictInfo dictInfo) - { + public List selectDictInfoList(DictInfo dictInfo) { return dictInfoMapper.selectDictInfoList(dictInfo); } @@ -60,11 +57,19 @@ public class DictInfoServiceImpl extends ServiceImpl im @Override public boolean insertDictInfo(DictInfo dictInfo) throws ServletException { dictInfo.setCreateTime(DateUtils.getNowDate()); - boolean b = this.saveOrUpdate(dictInfo, new LambdaUpdateChainWrapper(DictInfo.class) {{ + DictInfo one = this.getOne(new LambdaQueryWrapper() {{ eq(DictInfo::getDictId, dictInfo.getDictId()); - eq(DictInfo::getId, dictInfo.getId()); + eq(DictInfo::getInfoName, dictInfo.getInfoName()); + eq(DictInfo::getInfoValue, dictInfo.getInfoValue()); + }}); + if (one!=null){ + throw new ServletException("该字典内容已存在"); + } + boolean b = this.saveOrUpdate(dictInfo, new LambdaUpdateWrapper(DictInfo.class) {{ + eq(DictInfo::getDictId, dictInfo.getDictId()); + eq(DictInfo::getInfoName, dictInfo.getInfoName()); + eq(DictInfo::getInfoValue, dictInfo.getInfoValue()); }}); - if (!b)throw new ServletException("该字典内容已存在"); return b; } @@ -75,8 +80,7 @@ public class DictInfoServiceImpl extends ServiceImpl im * @return 结果 */ @Override - public int updateDictInfo(DictInfo dictInfo) - { + public int updateDictInfo(DictInfo dictInfo) { dictInfo.setUpdateTime(DateUtils.getNowDate()); return dictInfoMapper.updateDictInfo(dictInfo); } @@ -88,8 +92,7 @@ public class DictInfoServiceImpl extends ServiceImpl im * @return 结果 */ @Override - public int deleteDictInfoByIds(Long[] ids) - { + public int deleteDictInfoByIds(Long[] ids) { return dictInfoMapper.deleteDictInfoByIds(ids); } @@ -100,8 +103,7 @@ public class DictInfoServiceImpl extends ServiceImpl im * @return 结果 */ @Override - public int deleteDictInfoById(Long id) - { + public int deleteDictInfoById(Long id) { return dictInfoMapper.deleteDictInfoById(id); } }