1.增加列表缺少字段导出相应修改 2.增加分组域配置批量删除功能 3.修复分组域配置导入不下发bug
This commit is contained in:
zhangwenqing
@@ -3,10 +3,11 @@ 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;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.nis.domain.basics.PolicyGroupInfo;
|
||||
import com.nis.web.dao.basics.PolicyGroupInfoDao;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.ibatis.session.ExecutorType;
|
||||
import org.apache.ibatis.session.SqlSession;
|
||||
@@ -16,17 +17,22 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import com.beust.jcommander.internal.Maps;
|
||||
import com.nis.domain.FunctionRegionDict;
|
||||
import com.nis.domain.FunctionServiceDict;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.basics.CommonGroupInfo;
|
||||
import com.nis.domain.basics.IpCommCfg;
|
||||
import com.nis.domain.basics.PolicyGroupInfo;
|
||||
import com.nis.domain.configuration.BaseIpCfg;
|
||||
import com.nis.domain.configuration.CfgIndexInfo;
|
||||
import com.nis.exceptions.MaatConvertException;
|
||||
import com.nis.util.ConfigServiceUtil;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.StringUtils;
|
||||
import com.nis.web.controller.configuration.ObjectGroupController;
|
||||
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.service.BaseService;
|
||||
import com.nis.web.service.SpringContextHolder;
|
||||
@Service
|
||||
@@ -36,7 +42,9 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
private IpCommGroupCfgDao ipCommGroupCfgDao;
|
||||
@Autowired
|
||||
private PolicyGroupInfoDao policyGroupInfoDao;
|
||||
|
||||
@Autowired
|
||||
private CommonPolicyDao commonPolicyDao;
|
||||
|
||||
private CommonGroupManageService groupManageService = SpringContextHolder.getBean(CommonGroupManageService.class);
|
||||
|
||||
/**
|
||||
@@ -61,16 +69,6 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
return ipCommGroupCfgDao.get(id);
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void save(List<IpCommCfg> entitys) {
|
||||
logger.warn("Start to save IP,size:"+entitys.size());
|
||||
long start=System.currentTimeMillis();
|
||||
for(IpCommCfg ipCfg:entitys) {
|
||||
ipCommGroupCfgDao.insert(ipCfg);
|
||||
}
|
||||
long end=System.currentTimeMillis();
|
||||
logger.warn("Save IP finish,cost:"+(end-start));
|
||||
}
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
public void update(IpCommCfg entity){
|
||||
// 获取分组ID
|
||||
@@ -132,21 +130,100 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
|
||||
}
|
||||
// 更新分组状态
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, 5);
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void delete(String ids, String groupIds) {
|
||||
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
|
||||
if(ids==null) {
|
||||
throw new RuntimeException("ids is null!");
|
||||
public void delete(String ids, String groupIds, IpCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||
if(ids == null) {
|
||||
groupIds = "";
|
||||
String cfgIds = "";
|
||||
String serviceGroupIds = "";
|
||||
|
||||
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置）-> 配置分别操作更新或取消
|
||||
List<IpCommCfg> set = ipCommGroupCfgDao.getGroupIds(cfg);
|
||||
if(set.size() == 0) { // 无可删除配置
|
||||
return;
|
||||
}else {
|
||||
for (IpCommCfg ipCommCfg : set) {
|
||||
Integer groupId = ipCommCfg.getGroupId();
|
||||
cfgIds += ","+ipCommCfg.getCfgId();
|
||||
if(!serviceGroupIds.contains(groupId+"")) {
|
||||
serviceGroupIds += ","+groupId;
|
||||
}
|
||||
}
|
||||
cfgIds = cfgIds.substring(1);
|
||||
serviceGroupIds = serviceGroupIds.substring(1);
|
||||
}
|
||||
ipCommGroupCfgDao.delete(cfgIds);
|
||||
|
||||
String[] strings = serviceGroupIds.split(",");
|
||||
serviceGroupIds = "";
|
||||
for (String groupId : strings) {
|
||||
Integer size = ipCommGroupCfgDao.getCfgInfoByGroupIds(groupId);
|
||||
if(size == 0) { // 需配置取消
|
||||
serviceGroupIds += ","+groupId;
|
||||
}else { // 需配置更新
|
||||
groupIds += ","+groupId;
|
||||
}
|
||||
}
|
||||
|
||||
// 配置取消
|
||||
if(StringUtils.isNotBlank(serviceGroupIds)) {
|
||||
serviceGroupIds = serviceGroupIds.substring(1);
|
||||
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
|
||||
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
|
||||
Properties props = groupController.getMsgProp();
|
||||
|
||||
// 配置未生效
|
||||
String updateStatusGroupIds = "";
|
||||
for (String groupId : serviceGroupIds.split(",")) {
|
||||
List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
|
||||
if(list.size() > 0) {
|
||||
updateStatusGroupIds += ","+groupId;
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(updateStatusGroupIds)) {
|
||||
updateStatusGroupIds = updateStatusGroupIds.substring(1);
|
||||
CfgIndexInfo entity = new CfgIndexInfo();
|
||||
entity.setUserRegion5(updateStatusGroupIds);
|
||||
entity.setFunctionId(888);
|
||||
entity.setCommonGroupIds("");
|
||||
entity.setIsValid(Constants.VALID_NO);
|
||||
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
|
||||
|
||||
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
|
||||
}
|
||||
|
||||
// 配置已生效
|
||||
CfgIndexInfo entity = new CfgIndexInfo();
|
||||
entity.setUserRegion5(serviceGroupIds);
|
||||
entity.setServiceId(0);
|
||||
entity.setFunctionId(888);
|
||||
entity.setIsValid(Constants.VALID_NO);
|
||||
entity.setIsAudit(Constants.AUDIT_NOT_YES);
|
||||
entity.setBatchAuditValue("1");
|
||||
entity.setBatchValidValue("1,0");
|
||||
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
|
||||
}
|
||||
// 配置更新
|
||||
if(StringUtils.isNotBlank(groupIds)) {
|
||||
groupIds = groupIds.substring(1);
|
||||
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
}
|
||||
|
||||
}else {
|
||||
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
|
||||
ipCommGroupCfgDao.delete(ids);
|
||||
// 更新分组状态
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
|
||||
}
|
||||
ipCommGroupCfgDao.delete(ids);
|
||||
// 更新分组状态
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, 5);
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
}
|
||||
|
||||
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
|
||||
@@ -155,7 +232,7 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
long start=System.currentTimeMillis();
|
||||
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
|
||||
SqlSession batchSqlSession = null;
|
||||
//需要通过新增域接口新增的ip集合
|
||||
// 导入域配置 -> ①分组不存在，新增分组并返回serviceGroupId ②分组存在，获取serviceGroupId -> 数据入库 -> 更新分组状态 -> 判断是否配置下发
|
||||
try{
|
||||
String ids = "";
|
||||
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
|
||||
@@ -178,6 +255,8 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
String serviceGroupIds = ids.substring(1);
|
||||
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
|
||||
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
|
||||
// 判断是否配置下发
|
||||
transObjGroupToMaat(policyGroupInfos);
|
||||
|
||||
}finally {
|
||||
if(batchSqlSession != null){
|
||||
@@ -190,4 +269,5 @@ public class IpCommGroupCfgService extends BaseService {
|
||||
cfgs.clear();
|
||||
cfgs=null;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user