From 0140a478e2702fd27eb1ab54a5c24c5ac82fe079 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 19 Nov 2018 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?asn=E7=BC=93=E5=AD=98=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E6=B7=BB=E5=8A=A0=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82=20asn=20ip=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E4=B8=ADis=5Fissued=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/AsnCacheUtils.java | 3 + .../service/configuration/IpCfgService.java | 81 +------------------ 2 files changed, 7 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/nis/util/AsnCacheUtils.java b/src/main/java/com/nis/util/AsnCacheUtils.java index d59d07007..257d326c2 100644 --- a/src/main/java/com/nis/util/AsnCacheUtils.java +++ b/src/main/java/com/nis/util/AsnCacheUtils.java @@ -47,6 +47,9 @@ public class AsnCacheUtils{ Element element = getCache(ASN_NO_CACHE).get(key); return (Map)element.getObjectValue(); } + public static void clearCache() { + CacheUtils.getCacheManager().removeCache(ASN_NO_CACHE); + } /** * 初始化缓存 */ diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index ebb6dc5a8..c446af15e 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -35,6 +35,7 @@ import com.nis.domain.maat.ToMaatBean; import com.nis.domain.maat.ToMaatResult; import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; +import com.nis.util.AsnCacheUtils; import com.nis.util.ConfigServiceUtil; import com.nis.util.Configurations; import com.nis.util.Constants; @@ -279,7 +280,8 @@ public class IpCfgService extends CrudService { this.saveIpBatch(cfg.getAreaCfg()); } ipCfgDao.update(cfg); - } + } + @Deprecated public void audit(BaseIpCfg cfg) throws Exception{ //更新IP配置与区域IP的状态 List beans=new ArrayList<>(); @@ -464,82 +466,6 @@ public class IpCfgService extends CrudService { } } } - public void auditWhiteIp(BaseIpCfg cfg) throws Exception{ - List beans=new ArrayList<>(); - beans.add(cfg); - ipCfgDao.audit(cfg); - List configCompileList = new ArrayList<>(); - List groupRelationList = new ArrayList<>(); - List ipRegionList = new ArrayList<>(); - List strRegionList = new ArrayList<>(); - List numRegionList = new ArrayList<>(); - List digestRegionList = new ArrayList<>(); - List areaIpRegionList = new ArrayList<>(); - ToMaatBean maatBean = new ToMaatBean(); - MaatCfg maatCfg = new MaatCfg(); - maatCfg.initDefaultValue(); - BeanUtils.copyProperties(cfg, maatCfg); - - if(cfg.getIsAudit()==Constants.AUDIT_YES){ - maatBean.setOpAction(Constants.INSERT_ACTION); - Map map = cfgConvert(ipRegionList,beans,1,cfg,groupRelationList); - groupRelationList=map.get("groupList"); - ipRegionList=map.get("dstList"); - if (map.get("numRegionList") != null) { - numRegionList.addAll(map.get("numRegionList")); - } - maatCfg.setAreaEffectiveIds("0"); - maatCfg.setAction(cfg.getAction()); - maatCfg.setAuditTime(cfg.getAuditTime()); - maatCfg.setIpRegionList(ipRegionList); - maatCfg.setStrRegionList(strRegionList); - maatCfg.setNumRegionList(numRegionList); - maatCfg.setDigestRegionList(digestRegionList); - maatCfg.setGroupRelationList(groupRelationList); - maatCfg.setGroupNum(groupRelationList.size()); - maatCfg.setAreaIpRegionList(areaIpRegionList); - configCompileList.add(maatCfg); - maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(cfg.getAuditTime()); - maatBean.setCreatorName(cfg.getCurrentUser().getName()); - maatBean.setVersion(Constants.MAAT_VERSION); - //调用服务接口下发配置数据 - String json=gsonToJson(maatBean); - logger.info("IP白名单下发配置参数："+json); - //调用服务接口下发配置 - try { - ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); - if(result!=null){ - logger.info("IP白名单配置下发响应信息："+result.getMsg()); - } - } catch (Exception e) { - logger.error("IP白名单配置下发失败",e); - throw e; - } - }else if(cfg.getIsAudit()==Constants.AUDIT_NOT_YES){ - maatCfg.setCompileId(cfg.getCompileId()); - maatCfg.setServiceId(cfg.getServiceId()); - maatCfg.setIsValid(Constants.VALID_NO);//无效 - configCompileList.add(maatCfg); - maatBean.setConfigCompileList(configCompileList); - maatBean.setAuditTime(cfg.getAuditTime()); - maatBean.setCreatorName(cfg.getCurrentUser().getName()); - maatBean.setVersion(Constants.MAAT_VERSION); - maatBean.setOpAction(Constants.UPDATE_ACTION); - //调用服务接口取消配置 - String json=gsonToJson(maatBean); - logger.info("IP白名单配置参数："+json); - //调用服务接口取消配置 - try { - ToMaatResult result = ConfigServiceUtil.put(json, 1); - logger.info("IP白名单取消配置响应信息："+result.getMsg()); - } catch (Exception e) { - e.printStackTrace(); - logger.info("IP白名单取消配置失败"); - throw e; - } - } - } public void auditIpCfg(CfgIndexInfo entity,Integer isAudit) throws MaatConvertException{ Properties props=this.getMsgProp(); //修改数据库审核状态信息 @@ -830,6 +756,7 @@ public class IpCfgService extends CrudService { info.setIsIssued(1); //info.setGroupId(Integer.parseInt(entity.getUserRegion4())); configGroupInfoDao.updateConfigGroupInfobyGroupId(info); + AsnCacheUtils.put(info.getAsnId(), info); AsnIpCfg cfg=new AsnIpCfg(); cfg.setIsValid(Constants.VALID_YES); cfg.setAsnIpGroup(Integer.parseInt(entity.getUserRegion4()));