From e9a06cabaf521f8f9b6549dd9c8423598ff85e1a Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Mon, 24 Jun 2019 17:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3ObjectList=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basics/DomainCommGroupController.java | 14 +------ .../basics/IpCommGroupController.java | 15 ++------ .../basics/ScriberIdCommGroupController.java | 14 +------ .../basics/UrlCommGroupController.java | 14 +------ .../web/dao/basics/CommonGroupManageDao.java | 2 +- .../web/dao/basics/CommonGroupManageDao.xml | 4 +- .../basics/CommonGroupManageService.java | 37 ++++++++++++++----- .../basics/DomainCommGroupService.java | 35 ++++++++++-------- .../service/basics/IpCommGroupCfgService.java | 35 ++++++++++-------- .../basics/ScriberIdCommGroupService.java | 35 ++++++++++-------- .../service/basics/UrlCommGroupService.java | 35 ++++++++++-------- 11 files changed, 115 insertions(+), 125 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java b/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java index 602b03f8b..793ac98a0 100644 --- a/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java @@ -207,18 +207,8 @@ public class DomainCommGroupController extends BaseController{ } - Integer count = commonGroupManageService.getCountByGroupName(countSet, Constants.DOMAIN_OBJ_GROUP_TYPE); // 需调用服务接口获取GroupId的数量 - List groupIds= ConfigServiceUtil.getId(2,count); - if(count > 0) { - try { - groupIds = ConfigServiceUtil.getId(2,count); - } catch (Exception e) { - logger.error("获取组ID出错"); - throw new MaatConvertException("Get group id failed"); - } - } - - domainCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIds); + Map groupIdMap = commonGroupManageService.getCountByGroupName(countSet, Constants.DOMAIN_OBJ_GROUP_TYPE); // 调用服务接口获取GroupId + domainCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIdMap); _stringCfgs.clear(); } diff --git a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java index cdccae9af..32642a25f 100644 --- a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java @@ -281,18 +281,9 @@ public class IpCommGroupController extends BaseController { index++; } - Integer count = commonGroupManageService.getCountByGroupName(countSet, Constants.IP_OBJ_GROUP_TYPE); // 需调用服务接口获取GroupId的数量 - List groupIds = Lists.newArrayList(count); - if(count > 0) { - try { - groupIds = ConfigServiceUtil.getId(2,count); - } catch (Exception e) { - logger.error("获取组ID出错"); - throw new MaatConvertException("Get group id failed"); - } - } - - ipCommGroupCfgService.saveAndSend(regionDict, serviceDict, _ipPortCfgs, groupIds); + + Map groupIdMap = commonGroupManageService.getCountByGroupName(countSet, Constants.IP_OBJ_GROUP_TYPE); // 调用服务接口获取GroupId + ipCommGroupCfgService.saveAndSend(regionDict, serviceDict, _ipPortCfgs, groupIdMap); _ipPortCfgs.clear(); } diff --git a/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java b/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java index 51656c15b..f3d4bc261 100644 --- a/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java @@ -207,18 +207,8 @@ public class ScriberIdCommGroupController extends BaseController{ } - Integer count = commonGroupManageService.getCountByGroupName(countSet, Constants.SUBID_OBJ_GROUP_TYPE); // 需调用服务接口获取GroupId的数量 - List groupIds= ConfigServiceUtil.getId(2,count); - if(count > 0) { - try { - groupIds = ConfigServiceUtil.getId(2,count); - } catch (Exception e) { - logger.error("获取组ID出错"); - throw new MaatConvertException("Get group id failed"); - } - } - - scriberIdCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIds); + Map groupIdMap = commonGroupManageService.getCountByGroupName(countSet, Constants.SUBID_OBJ_GROUP_TYPE); // 调用服务接口获取GroupId + scriberIdCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIdMap); _stringCfgs.clear(); } diff --git a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java index cab6db715..4db84d43d 100644 --- a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java @@ -207,18 +207,8 @@ public class UrlCommGroupController extends BaseController{ } - Integer count = commonGroupManageService.getCountByGroupName(countSet, Constants.URL_OBJ_GROUP_TYPE); // 需调用服务接口获取GroupId的数量 - List groupIds= ConfigServiceUtil.getId(2,count); - if(count > 0) { - try { - groupIds = ConfigServiceUtil.getId(2,count); - } catch (Exception e) { - logger.error("获取组ID出错"); - throw new MaatConvertException("Get group id failed"); - } - } - - urlCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIds); + Map groupIdMap = commonGroupManageService.getCountByGroupName(countSet, Constants.URL_OBJ_GROUP_TYPE); // 调用服务接口获取GroupId + urlCommGroupService.saveAndSend(regionDict, serviceDict, _stringCfgs, groupIdMap); _stringCfgs.clear(); } diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java index 872158666..5c541aac6 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java @@ -28,7 +28,7 @@ public interface CommonGroupManageDao extends CrudDao { // 校验是否是当前引用Group的最后一条配置 public Integer ajaxCheckIsLastOneCfg(@Param("groupId")Integer groupId, @Param("cfgIds")String CfgIds, @Param("tableName")String indextable); - Integer getCountByGroupName(@Param("groupNameSet")Set set, @Param("groupType")Integer groupType); + Set getCountByGroupName(@Param("groupNameSet")Set set, @Param("groupType")Integer groupType); Integer getGroupIdByGroupName(@Param("groupName")String groupName, @Param("groupType")Integer groupType); diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml index a25f41025..ebf00cbb8 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml @@ -226,9 +226,9 @@ r.group_id = #{groupId} AND r.cfg_id NOT IN(${cfgIds}) - SELECT - COUNT(1) + r.group_name FROM policy_group_info r diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java index 944867cc0..939276d1f 100644 --- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java +++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java @@ -1,37 +1,32 @@ package com.nis.web.service.basics; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import com.nis.web.dao.basics.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import com.google.common.collect.Lists; import com.nis.domain.Page; import com.nis.domain.basics.CommonGroupInfo; import com.nis.domain.basics.DomainCommCfg; import com.nis.domain.basics.IpCommCfg; import com.nis.domain.basics.PolicyGroupInfo; -import com.nis.domain.basics.ProtectionListInfo; import com.nis.domain.basics.ScriberIdCommCfg; import com.nis.domain.basics.UrlCommCfg; import com.nis.exceptions.MaatConvertException; -import com.nis.util.CacheUtils; import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.util.StringUtil; import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.DomainCommGroupDao; import com.nis.web.dao.basics.IpCommGroupCfgDao; +import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.basics.ScriberIdCommGroupDao; import com.nis.web.dao.basics.UrlCommGroupDao; import com.nis.web.security.UserUtils; @@ -302,9 +297,31 @@ public class CommonGroupManageService extends BaseService{ } - public Integer getCountByGroupName(Set set, Integer groupType) { - Integer count = commonGroupManageDao.getCountByGroupName(set, groupType); - return set.size()-count; + public Map getCountByGroupName(Set allGroupNameSet, Integer groupType) { + Set existGroupNameSet = commonGroupManageDao.getCountByGroupName(allGroupNameSet, groupType); + Integer count = allGroupNameSet.size() - existGroupNameSet.size(); + + List groupIds = Lists.newArrayList(count); + if(count > 0) { + try { + groupIds = ConfigServiceUtil.getId(2,count); + } catch (Exception e) { + logger.error("获取组ID出错"); + throw new MaatConvertException("Get group id failed"); + } + } + allGroupNameSet.removeAll(existGroupNameSet); + + Map map = new HashMap(); + if(groupIds.size() == allGroupNameSet.size()) { + int index = 0; + for (String groupName : allGroupNameSet) { + map.put(groupName, groupIds.get(index)); + index++; + } + + } + return map; } diff --git a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java index ca3ce70e1..f6c714c53 100644 --- a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java @@ -3,6 +3,7 @@ package com.nis.web.service.basics; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -34,6 +35,7 @@ import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.DomainCommGroupDao; import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.configuration.CommonPolicyDao; +import com.nis.web.security.UserUtils; import com.nis.web.service.CrudService; import com.nis.web.service.SpringContextHolder; @@ -253,16 +255,14 @@ public class DomainCommGroupService extends CrudService, } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List> cfgs, List groupIds) { + public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List> cfgs, Map groupIdMap) { logger.warn("Start to save Domain,size:"+cfgs.size()); long start=System.currentTimeMillis(); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSession batchSqlSession = null; // 导入域配置 -> ①分组不存在，新增分组并返回groupId ②分组存在，获取groupId -> 数据 入库 -> 更新分组状态 -> 判断是否配置下发 try{ - int index = 0; String ids = ""; - List insertGroupList = new ArrayList(); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseStringCfg cfg:cfgs) { DomainCommCfg domainCommCfg=new DomainCommCfg(); @@ -270,28 +270,31 @@ public class DomainCommGroupService extends CrudService, Integer groupId = commonGroupManageDao.getGroupIdByGroupName(domainCommCfg.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE); if(groupId == null) { // 分组不存在，新增 UdFlag为1 - groupId = groupIds.get(index); - index++; - - CommonGroupInfo groupInfo = new CommonGroupInfo(); - groupInfo.setCreatorId(domainCommCfg.getCreatorId()); - groupInfo.setCreateTime(domainCommCfg.getCreateTime()); - groupInfo.setGroupName(domainCommCfg.getGroupName()); - groupInfo.setGroupType(Constants.DOMAIN_OBJ_GROUP_TYPE); - groupInfo.setServiceGroupId(groupId); - groupInfo.setUdFlag(1); - insertGroupList.add(groupInfo); + groupId = groupIdMap.get(domainCommCfg.getGroupName()); }else { if(!ids.contains(groupId+"")) { ids += ","+groupId; } } - domainCommCfg.setGroupId(groupId); ((DomainCommGroupDao) batchSqlSession.getMapper(DomainCommGroupDao.class)).insertCommGroupCfg(domainCommCfg); } batchSqlSession.commit(); - if(insertGroupList.size() > 0) { + + if(groupIdMap.size() > 0) { + Long creatorId = UserUtils.getUser().getId(); + Date createTime = new Date(); + List insertGroupList = new ArrayList(); + for (String groupName : groupIdMap.keySet()) { + CommonGroupInfo groupInfo = new CommonGroupInfo(); + groupInfo.setCreatorId(creatorId); + groupInfo.setCreateTime(createTime); + groupInfo.setGroupName(groupName); + groupInfo.setGroupType(Constants.DOMAIN_OBJ_GROUP_TYPE); + groupInfo.setServiceGroupId(groupIdMap.get(groupName)); + groupInfo.setUdFlag(1); + insertGroupList.add(groupInfo); + } commonGroupManageDao.insertBatch(insertGroupList); } diff --git a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java index 162fd76c0..9e7748768 100644 --- a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java +++ b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java @@ -3,6 +3,7 @@ package com.nis.web.service.basics; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -34,6 +35,7 @@ import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.IpCommGroupCfgDao; import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.configuration.CommonPolicyDao; +import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; import com.nis.web.service.SpringContextHolder; @Service @@ -239,16 +241,14 @@ public class IpCommGroupCfgService extends BaseService { } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List cfgs, List groupIds) { + public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List cfgs, Map groupIdMap) { logger.warn("Start to save IP,size:"+cfgs.size()); long start=System.currentTimeMillis(); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSession batchSqlSession = null; // 导入域配置 -> ①分组不存在，新增分组并返回serviceGroupId ②分组存在，获取serviceGroupId -> 数据入库 -> 更新分组状态 -> 判断是否配置下发 try{ - int index = 0; String ids = ""; - List insertGroupList = new ArrayList(); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseIpCfg cfg:cfgs) { IpCommCfg ipCommCfg=new IpCommCfg(); @@ -256,29 +256,32 @@ public class IpCommGroupCfgService extends BaseService { Integer groupId = commonGroupManageDao.getGroupIdByGroupName(ipCommCfg.getGroupName(), Constants.IP_OBJ_GROUP_TYPE); if(groupId == null) { // 分组不存在，新增 UdFlag为1 - groupId = groupIds.get(index); - index++; - - CommonGroupInfo groupInfo = new CommonGroupInfo(); - groupInfo.setCreatorId(ipCommCfg.getCreatorId()); - groupInfo.setCreateTime(ipCommCfg.getCreateTime()); - groupInfo.setGroupName(ipCommCfg.getGroupName()); - groupInfo.setGroupType(Constants.IP_OBJ_GROUP_TYPE); - groupInfo.setServiceGroupId(groupId); - groupInfo.setUdFlag(1); - insertGroupList.add(groupInfo); + groupId = groupIdMap.get(ipCommCfg.getGroupName()); }else { if(!ids.contains(groupId+"")) { ids += ","+groupId; } } - ipCommCfg.setGroupId(groupId); ((IpCommGroupCfgDao) batchSqlSession.getMapper(IpCommGroupCfgDao.class)).insertForBatch(ipCommCfg); } batchSqlSession.commit(); - if(insertGroupList.size() > 0) { + + if(groupIdMap.size() > 0) { + Long creatorId = UserUtils.getUser().getId(); + Date createTime = new Date(); + List insertGroupList = new ArrayList(); + for (String groupName : groupIdMap.keySet()) { + CommonGroupInfo groupInfo = new CommonGroupInfo(); + groupInfo.setCreatorId(creatorId); + groupInfo.setCreateTime(createTime); + groupInfo.setGroupName(groupName); + groupInfo.setGroupType(Constants.IP_OBJ_GROUP_TYPE); + groupInfo.setServiceGroupId(groupIdMap.get(groupName)); + groupInfo.setUdFlag(1); + insertGroupList.add(groupInfo); + } commonGroupManageDao.insertBatch(insertGroupList); } diff --git a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java index 95289dcd0..048ddc650 100644 --- a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java @@ -3,6 +3,7 @@ package com.nis.web.service.basics; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -34,6 +35,7 @@ import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.basics.ScriberIdCommGroupDao; import com.nis.web.dao.configuration.CommonPolicyDao; +import com.nis.web.security.UserUtils; import com.nis.web.service.CrudService; import com.nis.web.service.SpringContextHolder; @@ -254,16 +256,14 @@ public class ScriberIdCommGroupService extends CrudService> cfgs, List groupIds) { + public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List> cfgs, Map groupIdMap) { logger.warn("Start to save ScriberId,size:"+cfgs.size()); long start=System.currentTimeMillis(); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSession batchSqlSession = null; // 导入域配置 -> ①分组不存在，新增分组并返回groupId ②分组存在，获取groupId -> 数据 入库 -> 更新分组状态 -> 判断是否配置下发 try{ - int index = 0; String ids = ""; - List insertGroupList = new ArrayList(); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseStringCfg cfg:cfgs) { ScriberIdCommCfg commCfg=new ScriberIdCommCfg(); @@ -271,28 +271,31 @@ public class ScriberIdCommGroupService extends CrudService 0) { + + if(groupIdMap.size() > 0) { + Long creatorId = UserUtils.getUser().getId(); + Date createTime = new Date(); + List insertGroupList = new ArrayList(); + for (String groupName : groupIdMap.keySet()) { + CommonGroupInfo groupInfo = new CommonGroupInfo(); + groupInfo.setCreatorId(creatorId); + groupInfo.setCreateTime(createTime); + groupInfo.setGroupName(groupName); + groupInfo.setGroupType(Constants.SUBID_OBJ_GROUP_TYPE); + groupInfo.setServiceGroupId(groupIdMap.get(groupName)); + groupInfo.setUdFlag(1); + insertGroupList.add(groupInfo); + } commonGroupManageDao.insertBatch(insertGroupList); } diff --git a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java index 642c629ed..379061d91 100644 --- a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java @@ -3,6 +3,7 @@ package com.nis.web.service.basics; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -34,6 +35,7 @@ import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.basics.UrlCommGroupDao; import com.nis.web.dao.configuration.CommonPolicyDao; +import com.nis.web.security.UserUtils; import com.nis.web.service.CrudService; import com.nis.web.service.SpringContextHolder; @@ -254,16 +256,14 @@ public class UrlCommGroupService extends CrudService, UrlCom } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List> cfgs, List groupIds) { + public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List> cfgs, Map groupIdMap) { logger.warn("Start to save URL,size:"+cfgs.size()); long start=System.currentTimeMillis(); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); SqlSession batchSqlSession = null; // 导入域配置 -> ①分组不存在，新增分组并返回groupId ②分组存在，获取groupId -> 数据 入库 -> 更新分组状态 -> 判断是否配置下发 try{ - int index = 0; String ids = ""; - List insertGroupList = new ArrayList(); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseStringCfg cfg:cfgs) { UrlCommCfg urlCommCfg=new UrlCommCfg(); @@ -271,28 +271,31 @@ public class UrlCommGroupService extends CrudService, UrlCom Integer groupId = commonGroupManageDao.getGroupIdByGroupName(urlCommCfg.getGroupName(), Constants.URL_OBJ_GROUP_TYPE); if(groupId == null) { // 分组不存在，新增 UdFlag为1 - groupId = groupIds.get(index); - index++; - - CommonGroupInfo groupInfo = new CommonGroupInfo(); - groupInfo.setCreatorId(urlCommCfg.getCreatorId()); - groupInfo.setCreateTime(urlCommCfg.getCreateTime()); - groupInfo.setGroupName(urlCommCfg.getGroupName()); - groupInfo.setGroupType(Constants.URL_OBJ_GROUP_TYPE); - groupInfo.setServiceGroupId(groupId); - groupInfo.setUdFlag(1); - insertGroupList.add(groupInfo); + groupId = groupIdMap.get(urlCommCfg.getGroupName()); }else { if(!ids.contains(groupId+"")) { ids += ","+groupId; } } - urlCommCfg.setGroupId(groupId); ((UrlCommGroupDao) batchSqlSession.getMapper(UrlCommGroupDao.class)).insertUrlCommGroupCfg(urlCommCfg); } batchSqlSession.commit(); - if(insertGroupList.size() > 0) { + + if(groupIdMap.size() > 0) { + Long creatorId = UserUtils.getUser().getId(); + Date createTime = new Date(); + List insertGroupList = new ArrayList(); + for (String groupName : groupIdMap.keySet()) { + CommonGroupInfo groupInfo = new CommonGroupInfo(); + groupInfo.setCreatorId(creatorId); + groupInfo.setCreateTime(createTime); + groupInfo.setGroupName(groupName); + groupInfo.setGroupType(Constants.URL_OBJ_GROUP_TYPE); + groupInfo.setServiceGroupId(groupIdMap.get(groupName)); + groupInfo.setUdFlag(1); + insertGroupList.add(groupInfo); + } commonGroupManageDao.insertBatch(insertGroupList); }