gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉分组管理无用代码

Browse Source
This commit is contained in:
zhangwenqing
2019-06-05 10:40:36 +08:00
parent 2e2249ce15
commit c83472c508
20 changed files with 395 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
View File

@@ -16,15 +16,13 @@ import com.nis.domain.basics.CommonGroupInfo;
import com.nis.domain.basics.IpCommCfg;
import com.nis.domain.basics.UrlCommCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.AsnIpCfgDao;
import com.nis.web.dao.basics.CommonGroupManageDao;
import com.nis.web.dao.basics.IpCommGroupCfgDao;
import com.nis.web.dao.basics.UrlCommGroupDao;
import com.nis.web.dao.specific.ConfigGroupInfoDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import com.nis.web.service.SpringContextHolder;
@Service
public class CommonGroupManageService extends BaseService{
@@ -33,17 +31,11 @@ public class CommonGroupManageService extends BaseService{
private CommonGroupManageDao commonGroupManageDao;
@Autowired
private ConfigGroupInfoDao configGroupInfoDao;
@Autowired
private IpCommGroupCfgDao ipCommGroupCfgDao;
private IpCommGroupCfgDao ipCommGroupCfgDao; // 校验分组时使用
@Autowired
private UrlCommGroupDao urlCommGroupDao;
@Autowired
private AsnIpCfgDao asnIpCfgDao;
public Page<CommonGroupInfo> findCommonGroupInfoList(Page<CommonGroupInfo> page, CommonGroupInfo entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page);
@@ -60,52 +52,34 @@ public class CommonGroupManageService extends BaseService{
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(CommonGroupInfo entity) throws MaatConvertException{
entity.setIsValid(1);
//新增
if(entity.getGroupId()==null){
if(entity.getGroupId()==null){ // 新增
Date createTime=new Date();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
//asn类型从综合服务获取groupId 非ASN组 不对config_group_info表添加数据
/*if(4==entity.getGroupType().intValue()) {
int serviceGroupId=0;
List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
if(groupIds.size()>0) {
serviceGroupId=groupIds.get(0).intValue();
}else {
throw new MaatConvertException("Get asn group id failed");
}
entity.setServiceGroupId(serviceGroupId);
//新增协议分组
ConfigGroupInfo group = configGroupInfoDao.getConfigGroupInfoByGroupId(serviceGroupId);
if(group==null){
group = new ConfigGroupInfo();
group.setGroupId(serviceGroupId);
group.setGroupName(entity.getGroupName());
group.setIsIssued(0);
group.setGroupType(entity.getGroupType());
group.setAsnId(entity.getAsnNo());
configGroupInfoDao.insertConfigGroupInfo(group);
// if(group.getGroupType().intValue()==4) {
// AsnCacheUtils.put(entity.getAsnNo(), group);
// }
}
}*/
// 获取GroupId
int serviceGroupId=0;
List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
if(groupIds.size()>0) {
serviceGroupId=groupIds.get(0).intValue();
}else {
throw new MaatConvertException("Get group id failed");
}
entity.setServiceGroupId(serviceGroupId);
commonGroupManageDao.insert(entity);
//修改
}else{
}else{ // 修改
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
commonGroupManageDao.update(entity);
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deldete(String ids, int isValid){
//TODO 公共组删除时需检索是否有被对应公共组配置引用，被引用的公共组无法删除
IpCommGroupCfgService ipGroupCfgService = SpringContextHolder.getBean(IpCommGroupCfgService.class);
CommonGroupInfo entity=new CommonGroupInfo();
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
@@ -119,14 +93,16 @@ public class CommonGroupManageService extends BaseService{
}
}
}
}
// 查询指定类型的分组信息
// 分组配置界面使用
public List<CommonGroupInfo> findCommonGroupInfosByType(int type) {
List<CommonGroupInfo> list=commonGroupManageDao.findCommonGroupInfosByType(type);
return list;
}
// 导出时使用
public List<CommonGroupInfo> findGroupInfoList(String ids) {
List<CommonGroupInfo> list=commonGroupManageDao.findGroupInfoList(ids);
return list;
@@ -175,58 +151,4 @@ public class CommonGroupManageService extends BaseService{
return false;
}
/*
public List<PolicyGroupInfo> findPolicyGroupInfos() {
List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfos();
return list;
}
public List<PolicyGroupInfo> findNatPolicyGroups() {
List<PolicyGroupInfo> list=commonGroupManageDao.findNatPolicyGroups();
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosByType(int type) {
List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfosByType(type);
return list;
}
public List<PolicyGroupInfo> findHasIpPolicyGroupInfosByType(int type) {
List<PolicyGroupInfo> list=commonGroupManageDao.findHasIPPolicyGroupInfosByType(type);
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int type) {
List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfosByType(type);
return list;
}
public boolean checkIps(String groupIds) {
for(String groupId:groupIds.split(",")) {
Integer.parseInt(groupId);
}
List<Integer> hasIpList=asnIpCfgDao.hasGroupIds(groupIds);
if(hasIpList!=null&&hasIpList.size()>0) {
return true;
}
return false;
}
public PolicyGroupInfo getInfoByAsnNo(PolicyGroupInfo policyGroupInfo){
return commonGroupManageDao.getInfoByAsnNo(policyGroupInfo);
}
*//**
* IP复用配置表单-获取拥有区域信息的策略分组
* @param groupType
* @return
*//*
public List<PolicyGroupInfo> getHasAreaPolicyGroups(int groupType) {
return commonGroupManageDao.getHasAreaPolicyGroups(groupType);
}
public Integer getGroupIdByGroupName(String groupName){
return commonGroupManageDao.getGroupIdByGroupName(groupName);
}
public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){
return commonGroupManageDao.getGroupInfo(policyGroupInfo);
}*/
}

111
src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
View File

@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.apache.commons.collections.CollectionUtils;
import org.apache.ibatis.session.ExecutorType;
@@ -17,42 +15,24 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.beust.jcommander.internal.Maps;
import com.beust.jcommander.internal.Sets;
import com.google.common.collect.Lists;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.basics.IpCommCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.maat.GroupReuseAddBean;
import com.nis.domain.maat.GroupReuseCfg;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.basics.AsnGroupInfoDao;
import com.nis.web.dao.basics.AsnIpCfgDao;
import com.nis.web.dao.basics.IpCommGroupCfgDao;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
import com.nis.web.service.SpringContextHolder;
@Service
public class IpCommGroupCfgService extends BaseService {
@Autowired
private IpCommGroupCfgDao ipCommGroupCfgDao;
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
/**
* @param page
* @param entity
@@ -107,6 +87,14 @@ public class IpCommGroupCfgService extends BaseService {
if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) {
for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) {
BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"});
Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){
regionId = regionIds.get(0);
}else {
throw new MaatConvertException("Get region id failed");
}
entity.getIpCommGroupCfgList().get(i).setRegionId(regionId);
entity.getIpCommGroupCfgList().get(i).setRequestId(0);
entity.getIpCommGroupCfgList().get(i).setClassify("0");
entity.getIpCommGroupCfgList().get(i).setAttribute("0");
@@ -115,86 +103,12 @@ public class IpCommGroupCfgService extends BaseService {
entity.getIpCommGroupCfgList().get(i).setCreatorId(entity.getCurrentUser().getId());
entity.getIpCommGroupCfgList().get(i).setIsValid(Constants.VALID_NO);
entity.getIpCommGroupCfgList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
entity.getIpCommGroupCfgList().get(i).setGroupId(Integer.parseInt(entity.getUserRegion3()));
entity.getIpCommGroupCfgList().get(i).setGroupId(entity.getGroupId());
ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i));
}
}
}
// @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
// public void audit(List<IpCommCfg> ipCommGroupCfgs, Integer isAudit, Integer isValid) {
// // TODO Auto-generated method stub
// Set<Integer> groupIds=Sets.newHashSet();
// if(!StringUtil.isEmpty(ipCommGroupCfgs)){
// for(IpCommCfg cfg:ipCommGroupCfgs) {
// cfg.setIsValid(isValid);
// cfg.setIsAudit(isAudit);
// cfg.setAuditorId(UserUtils.getUser().getId());
// cfg.setAuditTime(new Date());
// groupIds.add(cfg.getGroupId());
// ipCommGroupCfgDao.update(cfg);
// }
// }
// //查询有效的Ip配置个数
// for(Integer groupId:groupIds) {
// Integer groupCount=ipCommGroupCfgDao.getGroupIdCount(groupId);
// if(groupCount>0){//udFlag 设置为1
// policyGroupInfoDao.updateUdFlag(groupId, 1,5);
// }else{//udFlag 设置为0
// policyGroupInfoDao.updateUdFlag(groupId, 0,5);
// }
// }
// //下发配置时改变公共组udFlag标识
// send2Maat(ipCommGroupCfgs,isValid);
// }
// public void send2Maat(List<IpCommCfg> ipCommGroupCfgs,int isValid) {
// GroupReuseAddBean maatBean = new GroupReuseAddBean();
// List<GroupReuseCfg> groupReuseList=new ArrayList<>();
// GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
// List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(ipCommGroupCfgs,isValid,null);
// List<StringCfg> strRegionList = new ArrayList<>();
// List<NumBoundaryCfg> numRegionList = new ArrayList<>();
// groupReuseCfg.setIpRegionList(ipRegionList);
// groupReuseCfg.setStrRegionList(strRegionList);
// groupReuseCfg.setNumRegionList(numRegionList);
// groupReuseList.add(groupReuseCfg);
// maatBean.setGroupReuseCfgList(groupReuseList);
// maatBean.setAuditTime(new Date());
// maatBean.setCreatorName(UserUtils.getUser().getName());
// maatBean.setVersion(Constants.MAAT_VERSION);
// logger.warn("IP Common Region Send To Maat start");
// long start=System.currentTimeMillis();
// if(isValid==Constants.VALID_YES) {
// maatBean.setOpAction(Constants.INSERT_ACTION);
// //调用服务接口下发配置数据
// String json=gsonToJson(maatBean);
// if(ipCommGroupCfgs.size()<=100) {
// logger.info("ip 公共组域新增配置下发配置参数："+json);
// }else {
// logger.info("ip 公共组域新增配置下发region条数："+ipCommGroupCfgs.size());
// }
// //调用服务接口下发配置
// ToMaatResult result =ConfigServiceUtil.postGroupReuseSources(json);
// logger.info("ip 公共组域新增配置响应信息："+result.getMsg());
// }else {
// maatBean.setOpAction(Constants.UPDATE_ACTION);
// //调用服务接口下发配置数据
// String json=gsonToJson(maatBean);
// if(ipCommGroupCfgs.size()<=100) {
// logger.info("ip 公共组域删除配置下发配置参数："+json);
// }else {
// logger.info("ip 公共组域删除配置下发region条数："+ipCommGroupCfgs.size());
//
// }
// //调用服务接口下发配置
// ToMaatResult result = ConfigServiceUtil.put(json,3);
// logger.info("asn ip复用域删除配置响应信息："+result.getMsg());
// }
// long end=System.currentTimeMillis();
// logger.warn("IP Common Region Send To Maat finish,cost:"+(end-start));
// }
public void delete(String ids) {
// TODO 公共组配置删除时 需检索是否被其它业务配置引用，没被引用可删除
@@ -203,6 +117,7 @@ public class IpCommGroupCfgService extends BaseService {
}
ipCommGroupCfgDao.delete(ids);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List<BaseIpCfg> cfgs,boolean send) {
logger.warn("Start to save IP,size:"+cfgs.size());

43
src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
View File

@@ -1,49 +1,28 @@
package com.nis.web.service.basics;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.basics.UrlCommCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.maat.GroupReuseAddBean;
import com.nis.domain.maat.GroupReuseCfg;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.MaatCfg.DigestCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.basics.UrlCommGroupDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.CrudService;
import com.nis.web.service.SpringContextHolder;
@Service
public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCommCfg>{
@Autowired
private UrlCommGroupDao urlCommGroupDao;
private UrlCommGroupDao urlCommGroupDao;
public Page<UrlCommCfg> findPage(Page<UrlCommCfg> page, UrlCommCfg entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
@@ -57,14 +36,11 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
return page;
}
public List<UrlCommCfg> findByPage(String ids) {
List<UrlCommCfg> list=urlCommGroupDao.findByPage(ids);
return list;
}
public UrlCommCfg get(Long id ) {
return urlCommGroupDao.get(id);
}
@@ -76,6 +52,14 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
if(entity.getUrlCommGroupList()!=null) {
for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) {
BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"});
Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){
regionId = regionIds.get(0);
}else {
throw new MaatConvertException("Get region id failed");
}
entity.getUrlCommGroupList().get(i).setRegionId(regionId);
entity.getUrlCommGroupList().get(i).setRequestId(0);
entity.getUrlCommGroupList().get(i).setClassify("0");
entity.getUrlCommGroupList().get(i).setAttribute("0");
@@ -90,6 +74,8 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
}else{
entity.getUrlCommGroupList().get(i).setExprType(0);
}
entity.getUrlCommGroupList().get(i).setGroupId(entity.getGroupId());
urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
}
// //修改公共组的标识
@@ -118,7 +104,6 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(String ids) {
urlCommGroupDao.delete(ids);
}
@@ -129,7 +114,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
return urlCommGroupDao.getByIds(ids);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
/*@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void audit(UrlCommCfg urlGroupCfg,Integer isAudit,Integer isValid) {
if(!StringUtil.isEmpty(urlGroupCfg)){
@@ -148,6 +133,6 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
}else{//udFlag 设置为0
urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 0);
}
}
}*/
}