From ee16314cc43e11d840a6396008cbf2b4673f82b0 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 20 Dec 2023 10:47:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E6=B7=BB=E5=8A=A0=E5=94=AF?= =?UTF-8?q?=E4=B8=80=E7=9A=84=E7=B3=BB=E7=BB=9F=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsRegionController.java | 3 +++ .../serve/modules/bms/entity/BmsRegion.java | 7 +++++++ .../serve/modules/bms/entity/BmsRegion2.java | 8 ++++++++ .../bms/entity/bo/BmsRegionBatchBo.java | 6 ++++++ .../modules/bms/mapper/BmsRegion2Mapper.java | 11 ++++++++++ .../modules/bms/mapper/BmsRegionMapper.java | 11 ++++++++++ .../modules/bms/mapper/BmsSupplierMapper.java | 2 ++ .../service/impl/BmsRegion2ServiceImpl.java | 20 +++++++++++++++++++ .../service/impl/BmsRegionServiceImpl.java | 20 +++++++++++++++++++ 9 files changed, 88 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java index 3fcbcf81..ea4b8a57 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java @@ -291,6 +291,9 @@ public class BmsRegionController { param.setAliasRegion(regionBo.getAliasRegion()); param.setStopFlag(regionBo.getStopFlag()); param.setRemark(regionBo.getRemark()); + param.setSysCode1(regionBo.getSysCode1()); + param.setSysCode2(regionBo.getSysCode2()); + param.setSysCode3(regionBo.getSysCode3()); boolean result = bmsRegionService.updateBmsRegionById(param); hisUserSupplierService.cleanTable(); return R.isTrue(result); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java index 6cb67a4e..2c58e9d8 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java @@ -66,6 +66,13 @@ public class BmsRegion implements Serializable { @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) private String[] factoryIds; + /** 系统编码1 */ + private String sysCode1; + /** 系统编码2 */ + private String sysCode2; + /** 系统编码3 */ + private String sysCode3; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java index 5f2d8620..c648f790 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java @@ -50,6 +50,14 @@ public class BmsRegion2 implements Serializable { /** 祖级id */ private String pathNames; + + /** 系统编码1 */ + private String sysCode1; + /** 系统编码2 */ + private String sysCode2; + /** 系统编码3 */ + private String sysCode3; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java index b7b5c3ef..6e47f3dc 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsRegionBatchBo.java @@ -39,6 +39,12 @@ public class BmsRegionBatchBo { private String remark; + /** 系统编码1 */ + private String sysCode1; + /** 系统编码2 */ + private String sysCode2; + /** 系统编码3 */ + private String sysCode3; } } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegion2Mapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegion2Mapper.java index 9e37b534..6bbce9a3 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegion2Mapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegion2Mapper.java @@ -3,6 +3,8 @@ package com.qs.serve.modules.bms.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bms.entity.BmsRegion2; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** @@ -15,5 +17,14 @@ public interface BmsRegion2Mapper extends BaseMapper { @Update("update bms_region2 set path_ids = null , path_names = null,level = -1") int updateSetPathNull(); + + @Select("select count(1) from bms_region2 where del_flag = 1 and sys_code1 = #{sysCode} and id != #{neId}") + Long countSysCode1(@Param("sysCode") String sysCode, @Param("neId")String neId); + + @Select("select count(1) from bms_region2 where del_flag = 1 and sys_code2 = #{sysCode} and id != #{neId}") + Long countSysCode2(@Param("sysCode") String sysCode,@Param("neId")String neId); + + @Select("select count(1) from bms_region2 where del_flag = 1 and sys_code3 = #{sysCode} and id != #{neId}") + Long countSysCode3(@Param("sysCode") String sysCode,@Param("neId")String neId); } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegionMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegionMapper.java index 809b4213..b22fe521 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegionMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsRegionMapper.java @@ -2,6 +2,8 @@ package com.qs.serve.modules.bms.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bms.entity.BmsRegion; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; /** @@ -14,5 +16,14 @@ public interface BmsRegionMapper extends BaseMapper { @Update("update bms_region set path_ids = null , path_names = null,level = -1") int updateSetPathNull(); + @Select("select count(1) from bms_region where del_flag = 1 and sys_code1 = #{sysCode} and id != #{neId}") + Long countSysCode1(@Param("sysCode") String sysCode, @Param("neId")String neId); + + @Select("select count(1) from bms_region where del_flag = 1 and sys_code2 = #{sysCode} and id != #{neId}") + Long countSysCode2(@Param("sysCode") String sysCode,@Param("neId")String neId); + + @Select("select count(1) from bms_region where del_flag = 1 and sys_code3 = #{sysCode} and id != #{neId}") + Long countSysCode3(@Param("sysCode") String sysCode,@Param("neId")String neId); + } diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java index de38d787..7657e58e 100644 --- a/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsSupplierMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bms.entity.BmsSupplier; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import java.util.List; @@ -44,5 +45,6 @@ public interface BmsSupplierMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") void updateBmsSuppliersOtherUserNullById(@Param("list") List ids); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java index 4f30ee20..da1a5d8d 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java @@ -46,12 +46,32 @@ public class BmsRegion2ServiceImpl extends ServiceImpl0){ + Assert.throwEx("系统编码1不可重复"); + } + } + if(StringUtils.hasText(param.getSysCode2())){ + long count1 = baseMapper.countSysCode1(param.getSysCode2(), param.getId());if(count1>0){ + Assert.throwEx("系统编码2不可重复"); + } + } + if(StringUtils.hasText(param.getSysCode3())){ + long count1 = baseMapper.countSysCode3(param.getSysCode3(), param.getId());if(count1>0){ + Assert.throwEx("系统编码3不可重复"); + } + } + } @Override public boolean updateBmsRegion2ById(BmsRegion2 param){ + this.checkSysCodes(param); BmsRegion2 ori = this.getById(param.getId()); param = this.toSetLevel(param); boolean changePid = !ori.getPid().equals(param.getPid()); diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java index eb45e71a..32f052a2 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java @@ -46,6 +46,7 @@ public class BmsRegionServiceImpl extends ServiceImpl @Override public boolean saveBmsRegion(BmsRegion param){ + this.checkSysCodes(param); param = this.flushSetLevel(param); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.orderByAsc(BmsFactory::getCode); @@ -54,8 +55,27 @@ public class BmsRegionServiceImpl extends ServiceImpl return this.save(param); } + private void checkSysCodes(BmsRegion param) { + if(StringUtils.hasText(param.getSysCode1())){ + long count1 = baseMapper.countSysCode1(param.getSysCode1(), param.getId());if(count1>0){ + Assert.throwEx("系统编码1不可重复"); + } + } + if(StringUtils.hasText(param.getSysCode2())){ + long count1 = baseMapper.countSysCode1(param.getSysCode2(), param.getId());if(count1>0){ + Assert.throwEx("系统编码2不可重复"); + } + } + if(StringUtils.hasText(param.getSysCode3())){ + long count1 = baseMapper.countSysCode3(param.getSysCode3(), param.getId());if(count1>0){ + Assert.throwEx("系统编码3不可重复"); + } + } + } + @Override public boolean updateBmsRegionById(BmsRegion param){ + this.checkSysCodes(param); BmsRegion ori = this.getById(param.getId()); param = this.flushSetLevel(param); boolean changePid = !ori.getPid().equals(param.getPid());