From 0110c194c4bf9cdffdb738b6f1fd0ef1bc000ec7 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 20 Sep 2024 12:11:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=A6=85=E9=81=93=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=9B2=E3=80=81system?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E7=9F=AD=E4=BF=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8A=A0=E5=AF=86=E4=B8=B2=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common}/enums/DeletedCodeEnum.java | 2 +- .../remainplaten/RemainPlateServiceImpl.java | 2 +- .../service/dict/DictTypeServiceImpl.java | 21 +++++++++++++++++-- .../src/main/resources/application.yaml | 6 +++--- 4 files changed, 24 insertions(+), 7 deletions(-) rename {cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage => cf-framework/cf-common/src/main/java/com/cf/imes/framework/common}/enums/DeletedCodeEnum.java (91%) diff --git a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DeletedCodeEnum.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/DeletedCodeEnum.java similarity index 91% rename from cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DeletedCodeEnum.java rename to cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/DeletedCodeEnum.java index 8963aa73a..caedf91d6 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-api/src/main/java/com/cf/imes/module/manage/enums/DeletedCodeEnum.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/DeletedCodeEnum.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.manage.enums; +package com.cf.imes.framework.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java index 821a823f0..6eb570638 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/remainplaten/RemainPlateServiceImpl.java @@ -5,7 +5,7 @@ import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlatePag import com.cf.imes.module.manage.controller.admin.plate.vo.remain.RemainPlateSaveReqVO; import com.cf.imes.module.manage.dal.dataobject.remainplaten.RemainPlateDO; import com.cf.imes.module.manage.dal.mysql.remainplaten.RemainPlateMapper; -import com.cf.imes.module.manage.enums.DeletedCodeEnum; +import com.cf.imes.framework.common.enums.DeletedCodeEnum; import com.cf.imes.module.manage.enums.RemainPlateStatusEnum; import com.cf.imes.module.manage.enums.RemainPlateUseTypeEnum; import org.springframework.stereotype.Service; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictTypeServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictTypeServiceImpl.java index 1af6b0759..134d04275 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictTypeServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictTypeServiceImpl.java @@ -1,17 +1,23 @@ package com.cf.imes.module.system.service.dict; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.cf.imes.framework.common.enums.DeletedCodeEnum; import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.date.LocalDateTimeUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; import com.cf.imes.module.system.controller.admin.dict.vo.type.DictTypeSaveReqVO; +import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO; import com.cf.imes.module.system.dal.dataobject.dict.DictTypeDO; +import com.cf.imes.module.system.dal.mysql.dict.DictDataMapper; import com.cf.imes.module.system.dal.mysql.dict.DictTypeMapper; import com.cf.imes.module.system.enums.ErrorCodeConstants; import com.google.common.annotations.VisibleForTesting; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -33,6 +39,9 @@ public class DictTypeServiceImpl implements DictTypeService { @Resource private DictTypeMapper dictTypeMapper; + @Resource + private DictDataMapper dictDataMapper; + @Override public PageResult getDictTypePage(DictTypePageReqVO pageReqVO) { return dictTypeMapper.selectPage(pageReqVO); @@ -63,17 +72,25 @@ public class DictTypeServiceImpl implements DictTypeService { } @Override + @Transactional(rollbackFor = Exception.class) public void updateDictType(DictTypeSaveReqVO updateReqVO) { + String updateReqVOType = updateReqVO.getType(); // 校验自己存在 - validateDictTypeExists(updateReqVO.getId()); + DictTypeDO oldDictTypeDO = validateDictTypeExists(updateReqVO.getId()); // 校验字典类型的名字的唯一性 validateDictTypeNameUnique(updateReqVO.getId(), updateReqVO.getName()); // 校验字典类型的类型的唯一性 - validateDictTypeUnique(updateReqVO.getId(), updateReqVO.getType()); + validateDictTypeUnique(updateReqVO.getId(), updateReqVOType); // 更新字典类型 DictTypeDO updateObj = BeanUtils.toBean(updateReqVO, DictTypeDO.class); dictTypeMapper.updateById(updateObj); + + // 字典类型发生改变，更新关联字典数据 + String oldDictTypeDOType = oldDictTypeDO.getType(); + if (ObjectUtil.isAllNotEmpty(oldDictTypeDOType, updateReqVOType) && ObjectUtil.notEqual(oldDictTypeDOType, updateReqVOType)) { + dictDataMapper.update(new LambdaUpdateWrapper().set(DictDataDO::getDictType, updateReqVOType).eq(DictDataDO::getDictType, oldDictTypeDOType).eq(DictDataDO::getStatus, DeletedCodeEnum.NOT_DELETED.getStatus())); + } } @Override diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml index ff3b4969c..085a8f37d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/application.yaml @@ -206,9 +206,9 @@ chenfeng: end-code: 9999 # 这里配置 9999 的原因是，测试方便。 sms: channel: DEBUG_DING_TALK - signature: - apiKey: 28PlJanD0aJLMyMLuH6JI5oVj1/j5ZNGvZPx/zguEvJl02PdrbWe5yIV4s1RSD3CDX9obUhITNlc6glW7MNJq03N7H/v50MFgN4f8mK1oAA= - apiSecret: O6Yk9gT3xQ9fqSKFuZa9I4bWOULCw2syH4/a1OrD2W7BAE2aQ+bSgqLXfBJT+de0GKHKgjuPNv0v+sDKkizLP22gsYIhdn/3OPSvyJF7Tng= + signature: sELLIaR5FAhCp8xx6tDJr1goyvsziMfTsD1HHxWnLkZgbVQOoly0GeadK81IkxbMVlvA5AhB7Apapg38Gx+MuE7G5xiVXt4JSzOqW1Qa6gn88joGXe0wh++lAtw= + apiKey: sELLIaR5FAhCp8xx6tDJr1goyvsziMfTsD1HHxWnLkZgbVQOoly0GeadK81IkxbMVlvA5AhB7Apapg38Gx+MuE7G5xiVXt4JSzOqW1Qa6gn88joGXe0wh++lAtw= + apiSecret: UjISv3wc1DfeFeG4WaPF4q8boPdrdhuUKuIhUDr1MImA0bK1KMqV76HL7fzEW2NR/Uqrq9Fe3vfWOCwblgKgL/J0twmrNCknBQSXhLNDw9zosoQR9Q1Lgql8dcI/d4g= encrypt: enable: false publicKey: cfimes