(1)BaseStringCfg 类修改为BaseStringCfg<T>,加入泛型。所有继承BaseStringCfg的类均已经修改泛型。

(2)HttpUrlCfg新增ratelimit一列,用于域名限速。
(3)域名限速新增/修改增加限速比例一列,列表展示新增限速比例一列。
(4)审核自定义域域名拦截与域名限速进行调整。
(5)删除MultipleCfg以及相关的dao,service
(6StringCfgService重命名为DomainService,其不具备字符串配置都能调用的功能
This commit is contained in:
wangxin
2018-06-29 12:44:33 +08:00
parent 25bb850d47
commit b30e88c3b8
48 changed files with 715 additions and 1084 deletions

View File

@@ -20,7 +20,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.google.gson.annotations.Expose;
import com.googlecode.ipv6.IPv6Address;
import com.googlecode.ipv6.IPv6Network;
import com.nis.domain.SysRole;
@@ -31,11 +30,7 @@ import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;

View File

@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import com.nis.domain.BaseEntity;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.configuration.AreaIpCfgDao;

View File

@@ -1035,7 +1035,7 @@ public class AvContentCfgService extends BaseService{
return avContentCfgDao.findStringCfgById(entity);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdateContUrl(BaseStringCfg entity,String areaCfgIds){
public void saveOrUpdateContUrl(BaseStringCfg<BaseStringCfg> entity,String areaCfgIds){
Date createTime=new Date();
entity.setTableName("av_cont_url_cfg");
//设置区域运营商信息
@@ -1288,7 +1288,7 @@ public class AvContentCfgService extends BaseService{
return avContentCfgDao.findStringCfgById(entity);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdatePicUrl(BaseStringCfg entity,String areaCfgIds){
public void saveOrUpdatePicUrl(BaseStringCfg<BaseStringCfg> entity,String areaCfgIds){
Date createTime=new Date();
entity.setTableName("av_pic_url_cfg");
//设置区域运营商信息

View File

@@ -5,31 +5,21 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.DnsDomainCfg;
import com.nis.domain.configuration.HttpBodyCfg;
import com.nis.domain.configuration.HttpReqHeadCfg;
import com.nis.domain.configuration.HttpResHeadCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.SslKeywordCfg;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
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.domain.maat.ToMaatBean;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;

View File

@@ -3,7 +3,6 @@ package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -13,27 +12,20 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.AvVoipIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.HttpBodyCfg;
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.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.ControlPolicyDao;
import com.nis.web.security.UserUtils;

View File

@@ -3,39 +3,18 @@ package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
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.callback.InlineIp;
import com.nis.domain.callback.NtcDnsResStrategy;
import com.nis.domain.configuration.AreaBean;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.AvVoipAccountCfg;
import com.nis.domain.configuration.AvVoipIpCfg;
import com.nis.domain.configuration.DnsIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.DnsIpCfg;
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.util.StringUtils;
import com.nis.web.dao.configuration.DnsIpCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;

View File

@@ -13,7 +13,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.HttpUrlCfg;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.MaatCfg.DigestCfg;
@@ -28,6 +27,7 @@ import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.AreaIpCfgDao;
import com.nis.web.dao.configuration.DomainDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.service.CrudService;
@@ -37,49 +37,16 @@ import com.nis.web.service.CrudService;
*
*/
@Service
public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
@Autowired
DomainDao domainDao;
@Autowired
protected StringCfgDao stringCfgDao;
@Autowired
protected AreaIpCfgDao areaIpCfgDao;
/**
*
* addStringCfg(新增IP类配置)
* (继承BaseStringCfg这个类方可使用)
* @param baseStringCfg
* @return
*int
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public int addStringCfg(BaseStringCfg baseStringCfg,List<BaseIpCfg> areaIpCfgs){
if(areaIpCfgs!=null&&areaIpCfgs.size()>0){
// this.saveIpBatch(areaIpCfgs);
}
//调用服务接口获取compileId
Integer compileId = 0;
try {
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
if(!StringUtil.isEmpty(compileIds)){
compileId = compileIds.get(0);
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileId!=0){
baseStringCfg.setCompileId(compileId);
return stringCfgDao.insert(baseStringCfg);
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
// baseStringCfg.setCompileId(0);
// return stringCfgDao.insert(baseStringCfg);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void addStringCfg(BaseStringCfg cfg){
public void addStringCfg(HttpUrlCfg cfg){
//调用服务接口获取compileId
Integer compileId = 0;
try {
@@ -105,14 +72,19 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
this.saveIpBatch(cfg.getAreaCfg());
}
stringCfgDao.insert(cfg);
if(cfg instanceof HttpUrlCfg){
domainDao.insert((HttpUrlCfg)cfg);
}else{
stringCfgDao.insert(cfg);
}
}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateStringCfg(BaseStringCfg cfg){
public void updateStringCfg(HttpUrlCfg cfg){
AreaIpCfg area=new AreaIpCfg();
area.setCompileId(cfg.getCompileId());
area.setFunctionId(cfg.getFunctionId());
@@ -132,12 +104,17 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
this.saveIpBatch(cfg.getAreaCfg());
}
stringCfgDao.update(cfg);
if(cfg instanceof HttpUrlCfg){
domainDao.insert((HttpUrlCfg)cfg);
}else{
stringCfgDao.update(cfg);
}
}
public void auditWhiteDomain(BaseStringCfg cfg) throws Exception{
List<BaseStringCfg> beans=new ArrayList<>();
public void auditWhiteDomain(HttpUrlCfg cfg) throws Exception{
List<HttpUrlCfg> beans=new ArrayList<>();
beans.add(cfg);
this.auditBatch(beans, StringCfgDao.class);
this.auditBatch(beans, DomainDao.class);
List<MaatCfg> configCompileList = new ArrayList<>();
List<GroupCfg> groupRelationList = new ArrayList<>();
List<IpCfg> ipRegionList = new ArrayList<>();
@@ -149,7 +126,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
MaatCfg maatCfg = new MaatCfg();
maatCfg.initDefaultValue();
BeanUtils.copyProperties(cfg, maatCfg);
if(cfg.getIsAudit()==1){
if(cfg.getIsAudit()==Constants.AUDIT_YES){
maatBean.setOpAction(Constants.INSERT_ACTION);
Map<String,List> map = cfgConvert(strRegionList,beans,2,cfg,groupRelationList);
groupRelationList=map.get("groupList");
@@ -181,10 +158,10 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
logger.info("域名白名单配置下发失败");
throw e;
}
}else if(cfg.getIsAudit()==3){
}else if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){
maatCfg.setCompileId(cfg.getCompileId());
maatCfg.setServiceId(cfg.getServiceId());
maatCfg.setIsValid(0);//无效
maatCfg.setIsValid(Constants.VALID_NO);//无效
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(cfg.getAuditTime());
@@ -205,10 +182,10 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
}
}
public void auditDomain(BaseStringCfg cfg) throws Exception{
List<BaseStringCfg> beans=new ArrayList<>();
public void auditDomain(HttpUrlCfg cfg) throws Exception{
List<HttpUrlCfg> beans=new ArrayList<>();
beans.add(cfg);
this.auditBatch(beans, StringCfgDao.class);
this.auditBatch(beans, DomainDao.class);
List<BaseIpCfg> beans1=new ArrayList<>();
List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId());
for(AreaIpCfg area:areaIpCfgList){
@@ -240,7 +217,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
MaatCfg maatCfg = new MaatCfg();
maatCfg.initDefaultValue();
BeanUtils.copyProperties(cfg, maatCfg);
if(cfg.getIsAudit()==1){
if(cfg.getIsAudit()==Constants.AUDIT_YES){
maatBean.setOpAction(Constants.INSERT_ACTION);
Map<String,List> map = cfgConvert(strRegionList,beans,2,cfg,groupRelationList);
groupRelationList=map.get("groupList");
@@ -251,7 +228,14 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
areaIpRegionList=areaMap.get("dstList");
maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds());
if(cfg.getServiceId().intValue()==Constants.SERVICE_PXY_DOMAIN_INTERCEPT){
maatCfg.setUserRegion(this.keywordsEscape(cfg.getCfgKeywords()));
String region=Constants.USERREGION_DOMIAN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
maatCfg.setUserRegion(region);
}else if(Constants.SERVICE_DOMAIN_RATELIMIT==cfg.getServiceId().intValue()){
String region=Constants.USERREGION_RATE_LIMIT+"="+cfg.getRatelimit()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
maatCfg.setUserRegion(region);
}
maatCfg.setAction(cfg.getAction());
maatCfg.setAuditTime(cfg.getAuditTime());
@@ -281,10 +265,10 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
logger.info("域名配置下发失败");
throw e;
}
}else if(cfg.getIsAudit()==3){
}else if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){
maatCfg.setCompileId(cfg.getCompileId());
maatCfg.setServiceId(cfg.getServiceId());
maatCfg.setIsValid(0);//无效
maatCfg.setIsValid(Constants.VALID_NO);//无效
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(cfg.getAuditTime());
@@ -308,12 +292,12 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteWhiteDomain(String ids){
List<BaseStringCfg> cfgs=new ArrayList<BaseStringCfg>();
List<HttpUrlCfg> cfgs=new ArrayList<HttpUrlCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String idStr:ids.split(",")){
if(StringUtils.isNotBlank(idStr)){
BaseStringCfg cfg=new BaseStringCfg();
HttpUrlCfg cfg=new HttpUrlCfg();
cfg.setCfgId(Long.parseLong(idStr));
cfg.setTableName(HttpUrlCfg.getTablename());
cfg.setEditorId(cfg.getCurrentUser().getId());
@@ -323,7 +307,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
}
}
}
this.deleteBatch(cfgs, StringCfgDao.class);
this.deleteBatch(cfgs, DomainDao.class);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteDomain(String ids,String compileIds,int functionId){
@@ -331,14 +315,14 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
for(String compileId:compileIds.split(",")){//强转数字防止注入
Integer.parseInt(compileId);
}
stringCfgDao.deleteByCompileIds(new BaseStringCfg().getCurrentUser().getId(),AreaIpCfg.getTablename(),compileIds);
stringCfgDao.deleteByCompileIds(new HttpUrlCfg().getCurrentUser().getId(),AreaIpCfg.getTablename(),compileIds);
}
List<BaseStringCfg> stringCfgs=new ArrayList<BaseStringCfg>();
List<HttpUrlCfg> stringCfgs=new ArrayList<HttpUrlCfg>();
Date date =new Date();
if(StringUtils.isNotBlank(ids)){
for(String idStr:ids.split(",")){
if(StringUtils.isNotBlank(idStr)){
BaseStringCfg cfg=new BaseStringCfg();
HttpUrlCfg cfg=new HttpUrlCfg();
cfg.setCfgId(Long.parseLong(idStr));
cfg.setTableName(HttpUrlCfg.getTablename());
cfg.setEditorId(cfg.getCurrentUser().getId());
@@ -361,7 +345,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteStringCfg(List<BaseStringCfg> stringCfg,List<BaseIpCfg> areaCfg){
public void deleteStringCfg(List<HttpUrlCfg> stringCfg,List<BaseIpCfg> areaCfg){
if(areaCfg!=null&&areaCfg.size()>0){
this.deleteIpBatch(areaCfg);
}
@@ -378,23 +362,23 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
public BaseStringCfg getStringCfgById(BaseStringCfg baseStringCfg){
return stringCfgDao.getById(baseStringCfg.getTableName(), baseStringCfg.getCfgId());
public HttpUrlCfg getStringCfgById(HttpUrlCfg baseStringCfg){
return domainDao.getById(baseStringCfg.getCfgId());
}
public BaseStringCfg getStringCfgById(String tableName, long id){
return stringCfgDao.getById(tableName, id);
public HttpUrlCfg getStringCfgById(long id){
return domainDao.getById(id);
}
public Integer getIsValid(BaseStringCfg baseStringCfg){
return stringCfgDao.getIsValid(baseStringCfg);
public Integer getIsValid(HttpUrlCfg baseStringCfg){
return domainDao.getIsValid(baseStringCfg);
}
public Integer getIsValid(String tableName, long id){
return stringCfgDao.getIsValid(tableName,id);
public Integer getIsValid(long id){
return domainDao.getIsValid(id);
}
public Integer getIsAudit(BaseStringCfg baseStringCfg){
return stringCfgDao.getIsAudit(baseStringCfg);
public Integer getIsAudit(HttpUrlCfg baseStringCfg){
return domainDao.getIsAudit(baseStringCfg);
}
public Integer getIsAudit(String tableName, long id){
return stringCfgDao.getIsAudit(tableName,id);
public Integer getIsAudit(long id){
return domainDao.getIsAudit(id);
}
/**
* getList(这里用一句话描述这个方法的作用)
@@ -406,9 +390,9 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
public List<BaseStringCfg> getListByCompileId(String tableName, String ids) {
public List<HttpUrlCfg> getListByCompileId(String ids) {
// TODO Auto-generated method stub
return stringCfgDao.getListByCompileId(tableName,ids);
return domainDao.getListByCompileId(ids);
}
/**
* getListByCfgId(这里用一句话描述这个方法的作用)
@@ -420,8 +404,8 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
* @exception
* @since 1.0.0
*/
public List<BaseStringCfg> getListByCfgId(String tableName, String ids) {
public List<HttpUrlCfg> getListByCfgId(String ids) {
// TODO Auto-generated method stub
return stringCfgDao.getListByCfgId(tableName, ids);
return domainDao.getListByCfgId(ids);
}
}

View File

@@ -1,349 +0,0 @@
package com.nis.web.service.configuration;
import java.util.ArrayList;
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.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.ComplexkeywordCfg;
import com.nis.domain.configuration.MultipleCfg;
import com.nis.domain.configuration.MultipleSearchCfg;
import com.nis.domain.configuration.NumBoundaryCfg;
import com.nis.util.Constants;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.configuration.ComplexStringCfgDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.dao.configuration.MultipleCfgDao;
import com.nis.web.dao.configuration.NumCfgDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.service.CrudService;
import com.nis.web.service.SpringContextHolder;
/**
* 多域相关配置事务类
* @author dell
*
*/
@Service
public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearchCfg> {
@Autowired
protected MultipleCfgDao multipleCfgDao;
@Autowired
protected IpCfgDao ipCfgDao;
@Autowired
protected StringCfgDao stringCfgDao;
@Autowired
protected ComplexStringCfgDao complexStringCfgDao;
@Autowired
protected NumCfgDao numCfgDao;
/**
*
* addStringCfg(新增IP类配置)
* (继承ComplexkeywordCfg这个类方可使用)
* @param cfg
* @return
*int
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void addCfg(MultipleCfg cfg){
if(cfg!=null) {
if(cfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:cfg.getIpCfg().values()){
ipCfgDao.insert(_cfg);
}
}
if(cfg.getStringCfg()!=null){
for(BaseStringCfg _cfg:cfg.getStringCfg().values()){
stringCfgDao.insert(_cfg);
}
}
if(cfg.getNumCfg()!=null){
for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){
numCfgDao.insert(_cfg);
}
}
if(cfg.getComplexCfg()!=null){
for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){
complexStringCfgDao.insert(_cfg);
}
}
if(cfg.getAreaCfg()!=null&&cfg.getAreaCfg().size()>0){
List<BaseIpCfg> areaCfg=new ArrayList<>();
areaCfg.addAll(cfg.getAreaCfg());
// this.saveIpBatch(areaCfg);
}
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void updateCfg(MultipleCfg cfg,List<BaseCfg> deleteCfg,List<BaseIpCfg> addAreaCfg,List<BaseIpCfg> updateAreaCfg,List<BaseIpCfg> deleteAreaCfgs){
if(cfg!=null){
if(cfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:cfg.getIpCfg().values()){
if(_cfg.getCfgId()==null){//修改配置时用户可能希望新增IP配置此时新增的IP配置无配置ID
ipCfgDao.insert(_cfg);
}else{
ipCfgDao.update(_cfg);
}
}
}
if(cfg.getStringCfg()!=null){
for(BaseStringCfg _cfg:cfg.getStringCfg().values()){
if(_cfg.getCfgId()==null){
stringCfgDao.insert(_cfg);
}else
stringCfgDao.update(_cfg);
}
}
if(cfg.getNumCfg()!=null){
for(NumBoundaryCfg _cfg:cfg.getNumCfg().values()){
if(_cfg.getCfgId()==null){
numCfgDao.insert(_cfg);
}else
numCfgDao.updateByPrimaryKeySelective(_cfg);
}
}
if(cfg.getComplexCfg()!=null){
for(ComplexkeywordCfg _cfg:cfg.getComplexCfg().values()){
if(_cfg.getCfgId()==null){
complexStringCfgDao.insert(_cfg);
}else
complexStringCfgDao.update(_cfg);
}
}
if(deleteCfg!=null&&deleteCfg.size()>0){
for(BaseCfg _cfg:deleteCfg){
if(_cfg instanceof BaseIpCfg){
ipCfgDao.deleteByCompileId((BaseIpCfg)_cfg);
}else if(_cfg instanceof BaseStringCfg){
stringCfgDao.deleteByCompileId((BaseStringCfg)_cfg);
}else if(_cfg instanceof NumBoundaryCfg){
numCfgDao.deleteByCompileId((NumBoundaryCfg)_cfg);
}else if(_cfg instanceof ComplexkeywordCfg){
complexStringCfgDao.deleteByCompileId((ComplexkeywordCfg)_cfg);
}
}
}
if(addAreaCfg!=null&&addAreaCfg.size()>0){
// this.saveIpBatch(addAreaCfg);
}
if(updateAreaCfg!=null&&updateAreaCfg.size()>0){
this.updateIpBatch(updateAreaCfg);
}
if(deleteAreaCfgs!=null&&deleteAreaCfgs.size()>0){
this.deleteIpBatch(deleteAreaCfgs);
}
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void deleteCfg(List<BaseIpCfg> delIpCfgs,List<BaseStringCfg> delStringCfgs,List<NumBoundaryCfg> delNumCfgs,List<ComplexkeywordCfg> delComplexCfgs){
if(delIpCfgs!=null&&delIpCfgs.size()>0){
this.deleteIpBatch(delIpCfgs);
}
if(delStringCfgs!=null&&delStringCfgs.size()>0){
this.deleteStringBatch(delStringCfgs);
}
if(delNumCfgs!=null&&delNumCfgs.size()>0){
this.deleteNumBatch(delNumCfgs);
}
if(delComplexCfgs!=null&&delComplexCfgs.size()>0){
this.deleteComplexBatch(delComplexCfgs);
}
}
/**
*
* auditCfg(这里用一句话描述这个方法的作用)
* (这里描述这个方法适用条件 可选)
* @param cfg
* @return
*int
* @throws Exception
* @exception
* @since 1.0.0
*/
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditCfg(int isAudit,List<MultipleCfg> sendCfgs,List<BaseIpCfg> auduitIpCfgs,
List<BaseStringCfg> auduitStringCfgs,List<NumBoundaryCfg> auduitNumCfgs,List<ComplexkeywordCfg> auduitComplexCfgs) throws Exception{
if(Constants.AUDIT_YES==isAudit||Constants.AUDIT_NOT_YES==isAudit){
List<List<BaseCfg>> cfgs=new ArrayList<List<BaseCfg>>();
for(MultipleCfg sendCfg:sendCfgs){
List<BaseCfg> cfg=new ArrayList<>();
if(sendCfg.getIpCfg()!=null){
for(BaseIpCfg _cfg:sendCfg.getIpCfg().values()){
cfg.add(_cfg);
}
}
if(sendCfg.getStringCfg()!=null){
for(BaseStringCfg _cfg:sendCfg.getStringCfg().values()){
cfg.add(_cfg);
}
}
if(sendCfg.getNumCfg()!=null){
for(NumBoundaryCfg _cfg:sendCfg.getNumCfg().values()){
cfg.add(_cfg);
}
}
if(sendCfg.getComplexCfg()!=null){
for(ComplexkeywordCfg _cfg:sendCfg.getComplexCfg().values()){
cfg.add(_cfg);
}
}
//设置区域ip
if(sendCfg.getAreaCfg()!=null){
if(cfg.size()>0){
cfg.get(0).setAreaCfg(sendCfg.getAreaCfg());
}else{
throw new RuntimeException("发送至maat异常没有有效的配置");
}
}
cfgs.add(cfg);
}
// if(this.sendToMaatConvertorBatch(isAudit, cfgs)){
// if(auduitIpCfgs!=null&&auduitIpCfgs.size()>0){
// this.auditIpBatch(auduitIpCfgs);
// }
// if(auduitStringCfgs!=null&&auduitStringCfgs.size()>0){
// this.auditStringBatch(auduitStringCfgs);
// }
// if(auduitNumCfgs!=null&&auduitNumCfgs.size()>0){
// this.auditNumBatch(auduitNumCfgs);
// }
// if(auduitComplexCfgs!=null&&auduitComplexCfgs.size()>0){
// this.auditComplexBatch(auduitComplexCfgs);
// }
// }else{
// throw new RuntimeException("发送至maat失败返回false!");
// }
}else{
if(auduitIpCfgs!=null&&auduitIpCfgs.size()>0){
this.auditIpBatch(auduitIpCfgs);
}
if(auduitStringCfgs!=null&&auduitStringCfgs.size()>0){
this.auditStringBatch(auduitStringCfgs);
}
if(auduitNumCfgs!=null&&auduitNumCfgs.size()>0){
this.auditNumBatch(auduitNumCfgs);
}
if(auduitComplexCfgs!=null&&auduitComplexCfgs.size()>0){
this.auditComplexBatch(auduitComplexCfgs);
}
}
}
/**
* 由于mysql不支持full join并且考虑mysql的性能问题这里分别从各个基础表里查询数据再拼接
*/
@Override
public Page<MultipleSearchCfg> findPage(Page<MultipleSearchCfg> page, MultipleSearchCfg entity) {
return super.findPage(page, entity);
}
private void deleteStringBatch(List<BaseStringCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
BaseStringCfg t = data.get(index);
((CrudDao<BaseStringCfg>) batchSqlSession.getMapper(StringCfgDao.class)).delete(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
private void deleteComplexBatch(List<ComplexkeywordCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
ComplexkeywordCfg t = data.get(index);
((CrudDao<ComplexkeywordCfg>) batchSqlSession.getMapper(ComplexStringCfgDao.class)).delete(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
private void deleteNumBatch(List<NumBoundaryCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
NumBoundaryCfg t = data.get(index);
((CrudDao<NumBoundaryCfg>) batchSqlSession.getMapper(NumCfgDao.class)).delete(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
private void auditStringBatch(List<BaseStringCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
BaseStringCfg t = data.get(index);
((CrudDao<BaseStringCfg>) batchSqlSession.getMapper(StringCfgDao.class)).audit(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
private void auditNumBatch(List<NumBoundaryCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
NumBoundaryCfg t = data.get(index);
((CrudDao<NumBoundaryCfg>) batchSqlSession.getMapper(NumCfgDao.class)).audit(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
private void auditComplexBatch(List<ComplexkeywordCfg> data) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
SqlSession batchSqlSession = null;
try{
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(int index = 0; index < data.size();index++){
ComplexkeywordCfg t = data.get(index);
((CrudDao<ComplexkeywordCfg>) batchSqlSession.getMapper(ComplexStringCfgDao.class)).audit(t);
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
}
}