From 6f0a31f42333133e4effbe01bf2ba134c289eaa4 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Mon, 19 Nov 2018 16:57:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96groupid?=
 =?UTF-8?q?=E4=B8=8Eregionid=E4=B8=BA=E6=89=B9=E9=87=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=EF=BC=8CIP=E9=85=8D=E7=BD=AE=E5=8D=8F=E8=AE=AE=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA0=E5=B9=B6=E4=B8=94=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AEIP=E5=8F=AA=E7=94=9F=E6=88=90=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E5=80=BC=E5=9F=9FIP=E5=8D=B3=E5=8F=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/BaseService.java | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index b2422d03a..07d4bd7ca 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -372,6 +372,7 @@ public abstract class BaseService {
 		if(cfgType==1){
 			List numRegionList = new ArrayList();
 			Integer groupId = 0;
+			Integer numGroupId = 0;
 			for(T srcCfg:srcList){
 				BaseIpCfg baseIpCfg = new BaseIpCfg();
 				BeanUtils.copyProperties(srcCfg, baseIpCfg);
@@ -398,40 +399,45 @@ public abstract class BaseService {
 				}
 				dstList.addAll(cfgs);
 				
-				//如果protocolId非空非零，需要构造数值型域配置
-				if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0){						
-					GroupCfg group1 = new GroupCfg();
-					group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
-					group1.setCompileId(baseIpCfg.getCompileId());
-					group1.setAuditTime(baseCfg.getAuditTime());
-					group1.setIsValid(baseCfg.getIsValid());
-					groupRelationList.add(group1);
-					NumBoundaryCfg numCfg = new NumBoundaryCfg();
-					numCfg.initDefaultValue();
-					numCfg.setLowBoundary(baseIpCfg.getProtocolId());
-					numCfg.setUpBoundary(baseIpCfg.getProtocolId());
-					numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
-					numCfg.setAuditTime(baseCfg.getAuditTime());
-					numCfg.setGroupId(group1.getGroupId());
-					numCfg.setIsValid(baseCfg.getIsValid());
-					numRegionList.add(numCfg);
-					map.put("numRegionList",numRegionList);
+				//如果protocolId非空非零，需要构造数值型域配置，多条相同协议的IP只需要一条数值域配置（目前没有不同协议IP&情况）
+				if(baseIpCfg.getProtocolId()!=null && baseIpCfg.getProtocolId()!=0 ){		
+					if(numGroupId==0){
+						GroupCfg group1 = new GroupCfg();
+						group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+						group1.setCompileId(baseIpCfg.getCompileId());
+						group1.setAuditTime(baseCfg.getAuditTime());
+						group1.setIsValid(baseCfg.getIsValid());
+						groupRelationList.add(group1);
+						NumBoundaryCfg numCfg = new NumBoundaryCfg();
+						numCfg.initDefaultValue();
+						numCfg.setLowBoundary(baseIpCfg.getProtocolId());
+						numCfg.setUpBoundary(baseIpCfg.getProtocolId());
+						numCfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
+						numCfg.setAuditTime(baseCfg.getAuditTime());
+						numCfg.setGroupId(group1.getGroupId());
+						numCfg.setIsValid(baseCfg.getIsValid());
+						numRegionList.add(numCfg);
+						map.put("numRegionList",numRegionList);
+						numGroupId++;
+					}
 				}
 			}
 			
 		}else if(cfgType==2 || cfgType==3){
+			List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
+			List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
 			for(int i=0;i<srcList.size();i++){
 				//一条业务配置创建一个分组
 				GroupCfg group = new GroupCfg();
 				StringCfg cfg = new StringCfg();
 				BeanUtils.copyProperties(srcList.get(i), cfg);
-				group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+				group.setGroupId(groupIdList.get(i));
 				group.setCompileId(baseCfg.getCompileId());
 				group.setAuditTime(baseCfg.getAuditTime());
 				group.setIsValid(baseCfg.getIsValid());
 				groupRelationList.add(group);
 				cfg.setGroupId(group.getGroupId());
-				cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
+				cfg.setRegionId(regionIdList.get(i));
 				cfg.setAuditTime(baseCfg.getAuditTime());
 				cfg.setIsValid(baseCfg.getIsValid());
 				//处理配置关键字转译
@@ -441,35 +447,39 @@ public abstract class BaseService {
 				dstList.add(cfg);
 			}
 		}else if(cfgType==4){
+			List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
+			List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
 			for(int i=0;i<srcList.size();i++){
 				//一条业务配置创建一个分组
 				com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg();
 				BeanUtils.copyProperties(srcList.get(i), cfg);
 				GroupCfg group = new GroupCfg();
-				group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+				group.setGroupId(groupIdList.get(i));
 				group.setCompileId(baseCfg.getCompileId());
 				group.setAuditTime(baseCfg.getAuditTime());
 				group.setIsValid(baseCfg.getIsValid());
 				groupRelationList.add(group);
 				cfg.setGroupId(group.getGroupId());
-				cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
+				cfg.setRegionId(regionIdList.get(i));
 				cfg.setAuditTime(baseCfg.getAuditTime());
 				cfg.setIsValid(baseCfg.getIsValid());
 				dstList.add(cfg);
 			}
 		}else if(cfgType==5){
+			List<Integer> groupIdList = ConfigServiceUtil.getId(2, srcList.size());
+			List<Integer> regionIdList = ConfigServiceUtil.getId(3, srcList.size());
 			for(int i=0;i<srcList.size();i++){
 				//一条业务配置创建一个分组
 				com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg();
 				BeanUtils.copyProperties(srcList.get(i), cfg);
 				GroupCfg group = new GroupCfg();
-				group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+				group.setGroupId(groupIdList.get(i));
 				group.setCompileId(baseCfg.getCompileId());
 				group.setAuditTime(baseCfg.getAuditTime());
 				group.setIsValid(baseCfg.getIsValid());
 				groupRelationList.add(group);
 				cfg.setGroupId(group.getGroupId());
-				cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
+				cfg.setRegionId(regionIdList.get(i));
 				cfg.setAuditTime(baseCfg.getAuditTime());
 				cfg.setIsValid(baseCfg.getIsValid());
 				dstList.add(cfg);