判断目录同名代码提交

src/main/java/com/keymobile/indicators/model/entity/indicators/BaseIndDef.java

@@ -41,4 +41,5 @@ public class BaseIndDef {
 	private List<BaseIndDef> childrens = new ArrayList<>();//子基础项
 	
 	private String formulaInfo;
+	private String indClasses;//数据项类型     0：一级数据项     1：二级数据项
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/DriveIndCatalogMapper.java

@@ -24,4 +24,7 @@ public interface DriveIndCatalogMapper extends BaseMapper<DriveIndCatalog>{
 	public List<DriveIndCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
 	
 	public List<DriveIndCatalog> findByCatalogTypeAndCode(Map<String,Object> params);
+	
+	public List<DriveIndCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndCatalogMapper.java

@@ -23,4 +23,7 @@ public interface IndCatalogMapper extends BaseMapper<IndCatalog>{
 	public List<IndCatalog> findFirstVaildCatalog(Map<String,Object> params);
 	
 	public List<IndCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
+	
+	public List<IndCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ScoreRuleCatalogMapper.java

@@ -20,4 +20,7 @@ public interface ScoreRuleCatalogMapper extends BaseMapper<ScoreRuleCatalog>{
 	public List<ScoreRuleCatalog> findByKeyword(Map<String,Object> params);
 	
 	public List<ScoreRuleCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
+	
+	public List<ScoreRuleCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ScorecardCatalogMapper.java

@@ -20,4 +20,7 @@ public interface ScorecardCatalogMapper extends BaseMapper<ScorecardCatalog>{
 	public List<ScorecardCatalog> findByKeyword(Map<String,Object> params);
 	
 	public List<ScorecardCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
+	
+	public List<ScorecardCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardCatalogMapper.java

@@ -20,4 +20,7 @@ public interface ShortboardCatalogMapper extends BaseMapper<ShortboardCatalog>{
 	public List<ShortboardCatalog> findByKeyword(Map<String,Object> params);
 	
 	public List<ShortboardCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
+	
+	public List<ShortboardCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardUnitCatalogMapper.java

@@ -20,4 +20,7 @@ public interface ShortboardUnitCatalogMapper extends BaseMapper<ShortboardUnitCa
 	public List<ShortboardUnitCatalog> findByKeyword(Map<String,Object> params);
 	
 	public List<ShortboardUnitCatalog> findByCatalogIdIn(@Param("ids") List<Integer> ids);
+	
+	public List<ShortboardUnitCatalog> findIsExist(@Param("catalogName") String catalogName,
+			@Param("parentId") Integer parentId,@Param("code") String code);
 }

src/main/java/com/keymobile/indicators/service/hytobacco/DriveIndCatalogService.java

@@ -26,8 +26,18 @@ public class DriveIndCatalogService {
 	
 	public DriveIndCatalog saveOrUpdate(DriveIndCatalog driveIndCatalog) throws Exception{
 		if(driveIndCatalog.getId()==null) {//新增
+			if(!driveIndCatalogMapper.findIsExist(driveIndCatalog.getCatalogName(), 
+					driveIndCatalog.getParentId(), driveIndCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			driveIndCatalogMapper.insert(driveIndCatalog);
+		}else {
+			List<DriveIndCatalog> dbList = driveIndCatalogMapper.findIsExist(driveIndCatalog.getCatalogName(), 
+					driveIndCatalog.getParentId(), driveIndCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(driveIndCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		Integer parentId = driveIndCatalog.getParentId();

src/main/java/com/keymobile/indicators/service/hytobacco/IndCatalogService.java

@@ -26,8 +26,18 @@ public class IndCatalogService {
 	
 	public IndCatalog saveOrUpdate(IndCatalog indCatalog) throws Exception{
 		if(indCatalog.getId()==null) {//新增
+			if(!indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), 
+					indCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			indCatalogMapper.insert(indCatalog);
+		}else {
+			List<IndCatalog> dbList = indCatalogMapper.findIsExist(indCatalog.getCatalogName(), indCatalog.getParentId(), 
+					indCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(indCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		int parentId = indCatalog.getParentId();

src/main/java/com/keymobile/indicators/service/hytobacco/ScoreRuleCatalogService.java

@@ -25,8 +25,18 @@ public class ScoreRuleCatalogService {
 	
 	public ScoreRuleCatalog saveOrUpdate(ScoreRuleCatalog scoreRuleCatalog) throws Exception{
 		if(scoreRuleCatalog.getId()==null) {//新增
+			if(!scoreRuleCatalogMapper.findIsExist(scoreRuleCatalog.getCatalogName(), 
+					scoreRuleCatalog.getParentId(), scoreRuleCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			scoreRuleCatalogMapper.insert(scoreRuleCatalog);
+		}else {
+			List<ScoreRuleCatalog> dbList = scoreRuleCatalogMapper.findIsExist(scoreRuleCatalog.getCatalogName(), 
+					scoreRuleCatalog.getParentId(), scoreRuleCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(scoreRuleCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		Integer parentId = scoreRuleCatalog.getParentId();

src/main/java/com/keymobile/indicators/service/hytobacco/ScorecardCatalogService.java

@@ -25,8 +25,18 @@ public class ScorecardCatalogService {
 	
 	public ScorecardCatalog saveOrUpdate(ScorecardCatalog scorecardCatalog) throws Exception{
 		if(scorecardCatalog.getId()==null) {//新增
+			if(!scorecardCatalogMapper.findIsExist(scorecardCatalog.getCatalogName(), 
+					scorecardCatalog.getParentId(), scorecardCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			scorecardCatalogMapper.insert(scorecardCatalog);
+		}else {
+			List<ScorecardCatalog> dbList = scorecardCatalogMapper.findIsExist(scorecardCatalog.getCatalogName(), 
+					scorecardCatalog.getParentId(), scorecardCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(scorecardCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		Integer parentId = scorecardCatalog.getParentId();

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardCatalogService.java

@@ -24,8 +24,18 @@ public class ShortboardCatalogService {
 	
 	public ShortboardCatalog saveOrUpdate(ShortboardCatalog shortboardCatalog) throws Exception{
 		if(shortboardCatalog.getId()==null) {//新增
+			if(!shortboardCatalogMapper.findIsExist(shortboardCatalog.getCatalogName(), 
+					shortboardCatalog.getParentId(), shortboardCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			shortboardCatalogMapper.insert(shortboardCatalog);
+		}else {
+			List<ShortboardCatalog> dbList = shortboardCatalogMapper.findIsExist(shortboardCatalog.getCatalogName(), 
+					shortboardCatalog.getParentId(), shortboardCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(shortboardCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		Integer parentId = shortboardCatalog.getParentId();

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardUnitCatalogService.java

@@ -25,8 +25,18 @@ public class ShortboardUnitCatalogService {
 	
 	public ShortboardUnitCatalog saveOrUpdate(ShortboardUnitCatalog shortboardUnitCatalog) throws Exception{
 		if(shortboardUnitCatalog.getId()==null) {//新增
+			if(!shortboardUnitCatalogMapper.findIsExist(shortboardUnitCatalog.getCatalogName(), 
+					shortboardUnitCatalog.getParentId(), shortboardUnitCatalog.getCode()).isEmpty()) {
+				throw new Exception("存在同名目录");
+			}
 			//保存
 			shortboardUnitCatalogMapper.insert(shortboardUnitCatalog);
+		}else {
+			List<ShortboardUnitCatalog> dbList = shortboardUnitCatalogMapper.findIsExist(shortboardUnitCatalog.getCatalogName(), 
+					shortboardUnitCatalog.getParentId(), shortboardUnitCatalog.getCode());
+			if(!dbList.isEmpty() && !dbList.get(0).getId().equals(shortboardUnitCatalog.getId())) {
+				throw new Exception("存在同名目录");
+			}
 		}
 		//获取parentId拼接idPath
 		Integer parentId = shortboardUnitCatalog.getParentId();

src/main/resources/mybatis/mapping/DriveIndCatalogMapper.xml

@@ -69,4 +69,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.indicators.DriveIndCatalog" >
+        select * 
+        from drive_ind_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and 
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/IndCatalogMapper.xml

@@ -58,4 +58,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.indicators.IndCatalog" >
+        select * 
+        from base_ind_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and 
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ScoreRuleCatalogMapper.xml

@@ -46,4 +46,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.objscorerule.ScoreRuleCatalog" >
+        select * 
+        from obj_score_rule_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and 
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ScorecardCatalogMapper.xml

@@ -46,4 +46,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.scorecard.ScorecardCatalog" >
+        select * 
+        from score_card_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ShortboardCatalogMapper.xml

@@ -46,4 +46,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.shortboard.ShortboardCatalog" >
+        select * 
+        from ind_short_board_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and 
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file

src/main/resources/mybatis/mapping/ShortboardUnitCatalogMapper.xml

@@ -46,4 +46,13 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="findIsExist" resultType="com.keymobile.indicators.model.entity.shortboard.ShortboardUnitCatalog" >
+        select * 
+        from short_board_unit_catalog 
+        where 
+        catalog_name=#{catalogName} and 
+        parent_id=#{parentId} and 
+        code=#{code}
+    </select>
 </mapper>
\ No newline at end of file