区域添加唯一的系统编码

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);

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")

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")

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;
     }
 
 }

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<BmsRegion2> {
     @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);
 }
 

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<BmsRegion> {
     @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);
+
 }
 

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<BmsSupplier> {
     @InterceptorIgnore(tenantLine = "1")
     void updateBmsSuppliersOtherUserNullById(@Param("list") List<String> ids);
 
+
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java

@@ -46,12 +46,32 @@ public class BmsRegion2ServiceImpl extends ServiceImpl<BmsRegion2Mapper,BmsRegio
 
     @Override
     public boolean saveBmsRegion2(BmsRegion2 param){
+        this.checkSysCodes(param);
         param = this.toSetLevel(param);
         return this.save(param);
     }
 
+
+    private void checkSysCodes(BmsRegion2 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 updateBmsRegion2ById(BmsRegion2 param){
+        this.checkSysCodes(param);
         BmsRegion2 ori = this.getById(param.getId());
         param = this.toSetLevel(param);
         boolean changePid = !ori.getPid().equals(param.getPid());

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java

@@ -46,6 +46,7 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
 
     @Override
     public boolean saveBmsRegion(BmsRegion param){
+        this.checkSysCodes(param);
         param = this.flushSetLevel(param);
         LambdaQueryWrapper<BmsFactory> lqw = new LambdaQueryWrapper<>();
         lqw.orderByAsc(BmsFactory::getCode);
@@ -54,8 +55,27 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
         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());