diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 14814c0c8..f9f0cfb13 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -61,17 +61,6 @@ public class BaseCfg extends BaseEntity implements Cloneable{ protected String exType;//导出类型 protected String hColumns;//导出隐藏列 - private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况) - public String getCommonGroupIds() { - return commonGroupIds; - } - - public void setCommonGroupIds(String commonGroupIds) { - this.commonGroupIds = commonGroupIds; - } - - - public String getExType() { return exType; } @@ -130,13 +119,13 @@ public class BaseCfg extends BaseEntity implements Cloneable{ /** * 有效标识 */ - @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109) + @ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90) @Expose protected Integer isValid; /** * 是否审核 */ - @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37) + @ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25) protected Integer isAudit; /** * 创建人员 diff --git a/src/main/java/com/nis/domain/maat/GroupReuseAddBean.java b/src/main/java/com/nis/domain/maat/GroupReuseAddBean.java index 8427a99ae..b19bf123e 100644 --- a/src/main/java/com/nis/domain/maat/GroupReuseAddBean.java +++ b/src/main/java/com/nis/domain/maat/GroupReuseAddBean.java @@ -44,7 +44,7 @@ public class GroupReuseAddBean implements Serializable{ @Expose private Integer opAction; @Expose - @SerializedName("commonGroupList") + @SerializedName("groupReuseList") private List groupReuseCfgList; public String getVersion() { diff --git a/src/main/java/com/nis/domain/maat/GroupReuseCfg.java b/src/main/java/com/nis/domain/maat/GroupReuseCfg.java index 8fb0a2d81..dbc391446 100644 --- a/src/main/java/com/nis/domain/maat/GroupReuseCfg.java +++ b/src/main/java/com/nis/domain/maat/GroupReuseCfg.java @@ -14,7 +14,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg; * */ public class GroupReuseCfg implements Serializable { - /*@Expose + @Expose @SerializedName("service") private Integer serviceId; public Integer getServiceId() { @@ -23,7 +23,7 @@ public class GroupReuseCfg implements Serializable { public void setServiceId(Integer serviceId) { this.serviceId = serviceId; } -*/ /** + /** * */ private static final long serialVersionUID = 1830956100866313836L; diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index 93392a39d..bcbf489e0 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -95,8 +95,6 @@ public class MaatCfg implements Serializable { @Expose @SerializedName("ipClientRangeList") private List areaIpRegionList; - @Expose - private List keepGroupList; public static class GroupCfg{ @Expose @@ -106,8 +104,6 @@ public class MaatCfg implements Serializable { @Expose private Integer isValid; @Expose - private Integer isCommonGroup; - @Expose @SerializedName("opTime") private Date auditTime; public Integer getGroupId() { @@ -134,12 +130,7 @@ public class MaatCfg implements Serializable { public void setAuditTime(Date auditTime) { this.auditTime = auditTime; } - public Integer getIsCommonGroup() { - return isCommonGroup; - } - public void setIsCommonGroup(Integer isCommonGroup) { - this.isCommonGroup = isCommonGroup; - } + } public static class StringCfg{ @Expose @@ -688,13 +679,6 @@ public class MaatCfg implements Serializable { public void setRequestId(Integer requestId) { this.requestId = requestId; } - - public List getKeepGroupList() { - return keepGroupList; - } - public void setKeepGroupList(List keepGroupList) { - this.keepGroupList = keepGroupList; - } public void initDefaultValue() { this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT; // this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT; diff --git a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java index 8021f8d66..7dade5be2 100644 --- a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java +++ b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java @@ -23,21 +23,6 @@ public class ConfigGroupInfo implements Serializable{ @ExcelField(title="cfg_id",sort=301) private Integer compileId; private Long asnId; - private Integer isAuditAll; //是否有策略选择了此公共组下发所有； - private Integer isUsed; //是否有策略选择了此公共组； - - public Integer getIsUsed() { - return isUsed; - } - public void setIsUsed(Integer isUsed) { - this.isUsed = isUsed; - } - public Integer getIsAuditAll() { - return isAuditAll; - } - public void setIsAuditAll(Integer isAuditAll) { - this.isAuditAll = isAuditAll; - } public Long getAsnId() { return asnId; diff --git a/src/main/java/com/nis/util/ConfigServiceUtil.java b/src/main/java/com/nis/util/ConfigServiceUtil.java index c17c18e43..d47f43c14 100644 --- a/src/main/java/com/nis/util/ConfigServiceUtil.java +++ b/src/main/java/com/nis/util/ConfigServiceUtil.java @@ -356,7 +356,7 @@ public class ConfigServiceUtil { }else if(type==2){ url = url+Constants.CALLBACK_CFG; }else if(type==3) { - url = url+Constants.DELETE_COMMON_REIGON; + url = url+Constants.GROUP_REUSE_SOURCES; } //创建连接 WebTarget wt = ClientUtil.getWebTarger(url); @@ -400,9 +400,9 @@ public class ConfigServiceUtil { url = url+Constants.MAAT_CFG; }else if(type==2){ url = url+Constants.CALLBACK_CFG; - }/*else if(type==3) { + }else if(type==3) { url = url+Constants.GROUP_REUSE_SOURCES; - }*/ + } logger.info("put url:"+url); //创建连接 try { @@ -463,43 +463,26 @@ public class ConfigServiceUtil { return bean; } /** - * 分组复用域配置新增,修改，删除 + * 分组复用域配置新增 * @param params * @return * @throws MaatConvertException */ - public static ToMaatResult auditCommonGroupRegionSources(String params,Integer action) throws MaatConvertException{ + public static ToMaatResult postGroupReuseSources(String params) throws MaatConvertException{ ToMaatResult bean = null; Response response=null; try { logger.warn("postGroupReuseSources start"); long start=System.currentTimeMillis(); String result = null; - String url = ""; - if(action.equals(Constants.OPACTION_POST)){ - url=Constants.SERVICE_URL+Constants.ADD_COMMON_REGION; - } - if(action.equals(Constants.OPACTION_PUT)){ - url=Constants.SERVICE_URL+Constants.UPDATE_COMMON_REIGON; - } - if(action.equals(Constants.OPACTION_DELETE)){ - url=Constants.SERVICE_URL+Constants.DELETE_COMMON_REIGON; - } + String url = Constants.SERVICE_URL+Constants.GROUP_REUSE_SOURCES; //创建连接 WebTarget wt = ClientUtil.getWebTarger(url); - logger.info("auditCommonGroupRegionSources url:"+url); + logger.info("postGroupReuseSources url:"+url); //获取响应结果 Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); try { - if(action.equals(Constants.OPACTION_POST)){ - response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); - } - if(action.equals(Constants.OPACTION_PUT)){ - response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); - } - if(action.equals(Constants.OPACTION_DELETE)){ - response= header.put(Entity.entity(params, MediaType.APPLICATION_JSON)); - } + response= header.post(Entity.entity(params, MediaType.APPLICATION_JSON)); if(response != null) { result=response.readEntity(String.class); } @@ -515,7 +498,7 @@ public class ConfigServiceUtil { throw new MaatConvertException(":"+result); } long end=System.currentTimeMillis(); - logger.warn("auditCommonGroupRegionSources end,cost:"+(end-start)); + logger.warn("postGroupReuseSources end,cost:"+(end-start)); } catch (Exception e) { throw e; } finally { @@ -525,7 +508,6 @@ public class ConfigServiceUtil { } return bean; } - /** * * getReport(配置日志总量统计查询) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 598857fa1..16aa98e50 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -13,9 +13,7 @@ public final class Constants { */ public static final int IMPORT_LIMIT=Configurations.getIntProperty("import_limit",10000); public static final Object IMPORT_LOCK=new Object(); - public static final String ADD_COMMON_REGION=Configurations.getStringProperty("addRegionToCommonGroup",""); - public static final String UPDATE_COMMON_REIGON=Configurations.getStringProperty("updateRegionToCommonGroup",""); - public static final String DELETE_COMMON_REIGON=Configurations.getStringProperty("deleteRegionToCommonGroup",""); + public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources"); public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001); public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455); public static String APP_CFG_USERREGION_SPLITOR=Configurations.getStringProperty("app_cfg_userregion_splitor", "&"); @@ -496,8 +494,6 @@ public final class Constants { public static final String HTTP_URL_REGION = Configurations.getStringProperty("http_url_region","http_url"); public static final String VOIP_IP_REGION = Configurations.getStringProperty("voip_ip","av_voip_ip"); public static final String VOIP_ACCOUNT_REGION = Configurations.getStringProperty("voip_account","av_voip_account"); - public static final String NTC_ASN_NUMBER = Configurations.getStringProperty("ntc_asn_number","NTC_ASN_NUMBER"); - public static final String ASN_KEY = Configurations.getStringProperty("asn_key","AS"); public static final String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0"); public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1); public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2); diff --git a/src/main/java/com/nis/util/excel/thread/DeleteAsnIpTread.java b/src/main/java/com/nis/util/excel/thread/DeleteAsnIpTread.java index c17419aee..95b12913d 100644 --- a/src/main/java/com/nis/util/excel/thread/DeleteAsnIpTread.java +++ b/src/main/java/com/nis/util/excel/thread/DeleteAsnIpTread.java @@ -44,7 +44,7 @@ public class DeleteAsnIpTread implements Callable { while(!asnNos.isEmpty()) { asnNos.drainTo(asnNoList,5); for(Long asnNo:asnNoList) { - AsnGroupInfo configGroupInfo=null;//AsnCacheUtils.get(asnNo); + AsnGroupInfo configGroupInfo=AsnCacheUtils.get(asnNo); if(configGroupInfo==null) { configGroupInfo=new AsnGroupInfo(); configGroupInfo.setAsnId(asnNo); @@ -85,7 +85,7 @@ public class DeleteAsnIpTread implements Callable { } sb.deleteCharAt(sb.toString().lastIndexOf(",")); asnIpCfgDao.delete(sb.toString()); - new AsnIpCfgService().asnIPRegionSendToMaat(listPage, Constants.VALID_NO,1); + new AsnIpCfgService().asnIPRegionSendToMaat(listPage, Constants.VALID_NO); transactionManager.commit(status); listPage.clear(); } catch (Throwable e) { diff --git a/src/main/java/com/nis/util/excel/thread/SaveAsnIpThread.java b/src/main/java/com/nis/util/excel/thread/SaveAsnIpThread.java index 95807ab8d..1ba4ffb38 100644 --- a/src/main/java/com/nis/util/excel/thread/SaveAsnIpThread.java +++ b/src/main/java/com/nis/util/excel/thread/SaveAsnIpThread.java @@ -112,7 +112,7 @@ public class SaveAsnIpThread implements Callable{ _cfg.setAsnIpGroup(asnNoMaps.get(1).get(Long.parseLong(_cfg.getUserRegion1()))); }else { // ConfigGroupInfo info=asnIpCfgService.getConfigGroupInfoByAsnNo(Long.parseLong(_cfg.getUserRegion1())); - AsnGroupInfo info=null;//AsnCacheUtils.get(Long.parseLong(_cfg.getUserRegion1())); + AsnGroupInfo info=AsnCacheUtils.get(Long.parseLong(_cfg.getUserRegion1())); if(info==null) { info=new AsnGroupInfo(); info.setAsnId(Long.parseLong(_cfg.getUserRegion1())); @@ -166,7 +166,7 @@ public class SaveAsnIpThread implements Callable{ this.save(cfgs); // splitAndSend(toAddRegionAsnIpCfgs,Constants.VALID_YES); if(toAddRegionAsnIpCfgs.size()>0) { - new AsnIpCfgService().asnIPRegionSendToMaat(toAddRegionAsnIpCfgs,Constants.VALID_YES,1); + new AsnIpCfgService().asnIPRegionSendToMaat(toAddRegionAsnIpCfgs,Constants.VALID_YES); } cfgs.clear(); toAddRegionAsnIpCfgs.clear(); diff --git a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java index 083aec09a..a00e3d8ef 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnGroupController.java @@ -1,10 +1,5 @@ package com.nis.web.controller.basics; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Properties; import javax.servlet.http.HttpServletRequest; @@ -102,8 +97,6 @@ public class AsnGroupController extends BaseController { public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds) { try { asnGroupInfoService.delete(ids,asnIds); - //TODO 查询本次删除的所有asnOrg组中是否存在asn 没有is_used=0的asn，如果存在则需要将整个组删除 - addMessage(redirectAttributes,"success","delete_success"); } catch (Exception e) { logger.error("删除失败",e); @@ -185,38 +178,5 @@ public class AsnGroupController extends BaseController { return true; } - /** - * 异步获取ASN组织信息 - * @param model - * @return - */ - @RequestMapping(value="ajaxGetAsnOrg") - @ResponseBody - public List ajaxGetAsnOrg( ConfigGroupInfo orgGroup,Model model){ - List orgaList=new ArrayList<>(); - try { - orgaList=configGroupInfoService.findAllList(orgGroup); - } catch (Exception e) { - logger.error("异步获取ASN组织信息失败",e); - return orgaList; - } - return orgaList; - } - /** - * 异步获取ASN组织信息 - * @param model - * @return - */ - @RequestMapping(value="ajaxGetAsnNo") - @ResponseBody - public List ajaxGetAsnNo(AsnGroupInfo asnGroup,Model model){ - List orgaList=new ArrayList<>(); - try { - orgaList=asnGroupInfoService.findAsnGroupList(asnGroup); - } catch (Exception e) { - logger.error("异步获取ASN NO信息失败",e); - return orgaList; - } - return orgaList; - } + } diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index 0ddf3a693..ae36a28f2 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -134,20 +134,7 @@ public class AsnIpController extends BaseController{ asnIpMap.put(Long.parseLong(asnIpCfg.getUserRegion1()), _asnIps); } } - /********************每次下发一个组的region，保证事物********************/ - for (Long asnId : asnIpMap.keySet()) { - try { - asnIpCfgService.auditIpBatch(asnIpMap.get(asnId),asnId,isValid); - } catch (Exception e) { - logger.error("配置下发失败：",e); - if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error", "request_service_failed"); - }else { - addMessage(redirectAttributes,"error", "audit_failed"); - } - - } - } + asnIpCfgService.auditIpBatch(asnIpMap,isValid); }/*else { //条件下所有配置审核 Page searchPage=new Page(request,response,"a"); diff --git a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java index ce497c857..9d5dd3bb2 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java @@ -29,7 +29,4 @@ public interface AsnGroupInfoDao extends CrudDao { List findAsnGroupInfos(); Long getCount(); void modifyIssuedIp(AsnGroupInfo info); - List findAsnGroupInfoByAsnGroup(AsnGroupInfo asnGroupInfo); - void updateIsUsedAndIsValid(@Param("asnNos")List asnNos,@Param("isUsed")Integer isUsed,@Param("isValid")Integer isValid); - List findAsnGroupInfoByAsnNos(@Param("asnNos")List asnNos,@Param("isUsed")Integer isUsed); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml index ff55e5c6f..2536d0e20 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml @@ -15,12 +15,10 @@ - - r.id,r.group_id,r.compile_id,r.organization,r.country,r.detail,r.is_valid,r.create_time,r.edit_time, - r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id + r.creator_id,r.editor_id,r.asn_id,r.issued_ips @@ -81,7 +79,7 @@ - insert into asn_group_info( - group_id, - compile_id, - organization, - country, - detail, - is_valid, - creator_id, - create_time, - editor_id, - edit_time, - asn_id, - is_used, - region_id + insert into asn_group_info(group_id,compile_id,organization,country,detail,is_valid,creator_id,create_time,editor_id,edit_time,asn_id )values ( #{groupId,jdbcType=INTEGER}, #{compileId,jdbcType=INTEGER}, @@ -114,9 +99,7 @@ #{createTime,jdbcType=TIMESTAMP}, #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP}, - #{asnId,jdbcType=INTEGER}, - #{isUsed,jdbcType=INTEGER}, - #{regionId,jdbcType=INTEGER} + #{asnId,jdbcType=INTEGER} ) @@ -154,12 +137,6 @@ edit_time = #{editTime,jdbcType=TIMESTAMP}, - - is_used = #{isUsed,jdbcType=INTEGER}, - - - region_id = #{regionId,jdbcType=INTEGER}, - @@ -170,28 +147,6 @@ - - update asn_group_info - - - is_used = #{isUsed,jdbcType=INTEGER}, - - - is_valid = #{isValid,jdbcType=INTEGER}, - - - - - and asn_id in - - #{asnId} - - - - and is_valid != #{isValid,jdbcType=INTEGER} - - - update asn_group_info @@ -250,7 +205,7 @@ - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java index 785ee0cf3..2782dfa2e 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java @@ -4,7 +4,6 @@ import java.util.List; import org.apache.ibatis.annotations.Param; -import com.nis.domain.basics.AsnGroupInfo; import com.nis.domain.basics.AsnIpCfg; import com.nis.domain.basics.Varibles; import com.nis.web.dao.CrudDao; @@ -21,7 +20,6 @@ public interface AsnIpCfgDao extends CrudDao{ public List hasASNIds(@Param("ids")String ids); public List hasASNIpAddrs(@Param("ids")String ids); public List findAllList(AsnIpCfg cfg); - public List findAllListByAsnGroup(@Param("entity")AsnIpCfg entity,@Param("asnGroups")List asnGroups,@Param("asnIds")String asnIds); // public List findPolicyGroupInfosByType(@Param("groupId")Integer groupId); public List findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId); public List countValidIPs(@Param("groups")String groups,@Param("ids")String ids); @@ -34,5 +32,4 @@ public interface AsnIpCfgDao extends CrudDao{ public int hasValidAsnIp(@Param("asnId")Long asnNo); public AsnIpCfg getOne(AsnIpCfg cfg); public void updateAsn(@Param("asnId")String asnNo,@Param("organization")String organization,@Param("country")String country,@Param("detail")String detail); - public void updateAsnIpByAsnGroups(@Param("entity")AsnIpCfg entity,@Param("asnGroups")List asnGroups,@Param("asnIds")String asnIds); } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index 2071ab66d..49825a600 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -308,26 +308,6 @@ AND r.asn_ip_group =#{asnIpGroup} - - - update asn_ip_cfg set - - is_valid=#{entity.isValid} , - is_audit=#{entity.isAudit}, - - AUDITOR_ID = #{entity.auditorId,jdbcType=INTEGER} - ,AUDIT_TIME = #{entity.auditTime,jdbcType=TIMESTAMP} - - - and user_region1 in - - #{asnGroup.asnId,jdbcType=INTEGER} - - - - and user_region1 in (select asn_id from asn_group_info where asn_id in(${asnIds}) and is_used=0) - - - - + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 9c84a2684..9f923529f 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -80,7 +80,6 @@ - @@ -199,7 +198,7 @@ a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1, - a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist,a.common_group_ids + a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port @@ -813,7 +812,6 @@ user_region5, do_log, do_blacklist - ,common_group_ids )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -841,8 +839,7 @@ #{userRegion4,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR}, #{doLog,jdbcType=INTEGER}, - #{doBlackList,jdbcType=INTEGER}, - #{commonGroupIds,jdbcType=VARCHAR} + #{doBlackList,jdbcType=INTEGER} ) @@ -873,8 +870,7 @@ user_region4, user_region5, do_log, - do_blacklist, - common_group_ids + do_blacklist )values ( #{cfgDesc,jdbcType=VARCHAR}, #{action,jdbcType=INTEGER}, @@ -902,8 +898,7 @@ #{userRegion4,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR}, #{doLog,jdbcType=INTEGER}, - #{doBlackList,jdbcType=INTEGER}, - #{commonGroupIds,jdbcType=VARCHAR} + #{doBlackList,jdbcType=INTEGER} ) @@ -995,7 +990,6 @@ action = #{action,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER}, do_blacklist = #{doBlackList,jdbcType=INTEGER}, - common_group_ids = #{commonGroupIds,jdbcType=VARCHAR}, is_valid = #{isValid,jdbcType=INTEGER}, is_audit = #{isAudit,jdbcType=INTEGER}, diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java index 891e4ecbc..99082bc06 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java @@ -5,7 +5,6 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import com.nis.domain.configuration.AsnKeywordCfg; -import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; @@ -25,7 +24,6 @@ public interface StringCfgDao extends CrudDao{ public List findList(BaseStringCfg entity) ; public int insert(BaseStringCfg entity) ; public int update(BaseStringCfg entity) ; - public int updateAsnKeyword(BaseStringCfg entity) ; public int updateValid(BaseStringCfg entity) ; public int audit(BaseStringCfg entity) ; public int getIsValid(@Param("tableName")String tableName,@Param("cfgId")Long id); @@ -48,7 +46,7 @@ public interface StringCfgDao extends CrudDao{ public void deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds); public List findSubscribeIdCfgListByCfgIndexInfo(CfgIndexInfo entity); public void deleteSubscribeIdCfgByCfgIndexInfo(CfgIndexInfo entity); - public void deleteAsnKeyword(BaseCfg entity); + public void deleteAsnKeyword(CfgIndexInfo entity); public List findSubscribeIdCfgList(NtcSubscribeIdCfg ntcSubscribeIdCfg); public List findAsnKeywordCfgList(CfgIndexInfo entity); public void saveSubscribeIdCfg(NtcSubscribeIdCfg ntcSubscribeIdCfg); diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 8ac2fba5b..395b37267 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -483,95 +483,6 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} - - update ${tableName} - - - - cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, - - - cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR}, - - - CFG_TYPE=#{cfgType,jdbcType=VARCHAR}, - - - action = #{action,jdbcType=INTEGER}, - - - is_valid = #{isValid,jdbcType=INTEGER}, - - - is_audit = #{isAudit,jdbcType=INTEGER}, - - - creator_id = #{creatorId,jdbcType=INTEGER}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - editor_id = #{editorId,jdbcType=INTEGER}, - - - edit_time = #{editTime,jdbcType=TIMESTAMP}, - - - auditor_id = #{auditorId,jdbcType=INTEGER}, - - - audit_time = #{auditTime,jdbcType=TIMESTAMP}, - - - service_id = #{serviceId,jdbcType=INTEGER}, - - - request_id = #{requestId,jdbcType=INTEGER}, - - - compile_id = #{compileId,jdbcType=INTEGER}, - - - is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, - - - classify = #{classify,jdbcType=VARCHAR}, - - - attribute = #{attribute,jdbcType=VARCHAR}, - - - lable = #{lable,jdbcType=VARCHAR}, - - - expr_type=#{exprType,jdbcType=INTEGER}, - - - match_method=#{matchMethod,jdbcType=INTEGER}, - - - is_hexbin=#{isHexbin,jdbcType=INTEGER}, - - - area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, - - - function_id = #{functionId,jdbcType=INTEGER}, - - - cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, - - USER_REGION1=#{userRegion1,jdbcType=VARCHAR}, - USER_REGION2=#{userRegion2,jdbcType=VARCHAR}, - USER_REGION3=#{userRegion3,jdbcType=VARCHAR}, - USER_REGION4=#{userRegion4,jdbcType=VARCHAR}, - USER_REGION5=#{userRegion5,jdbcType=VARCHAR}, - - - where cfg_id = #{cfgId,jdbcType=BIGINT} - - update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} @@ -841,7 +752,7 @@ - + delete from asn_keyword_cfg diff --git a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.java b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.java index 04e6e1806..f52b8a9d3 100644 --- a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.java @@ -15,7 +15,6 @@ public interface ConfigGroupInfoDao extends CrudDao{ void insertConfigGroupInfo(ConfigGroupInfo entity); int insertBatch(List list); void updateConfigGroupInfobyGroupId(ConfigGroupInfo entity); - void updateAsnOrgGroupByGroupInfo(ConfigGroupInfo entity); ConfigGroupInfo getConfigGroupInfoByGroupId(Integer groupId); @Cacheable(value="asnNoCache",key="#asnNo") ConfigGroupInfo getInfoByAsnNo(@Param("asnId")Long asnNo); @@ -24,6 +23,4 @@ public interface ConfigGroupInfoDao extends CrudDao{ //获取asn组织的groupId ConfigGroupInfo getAsnGroupByName(@Param("groupName")String groupName); int delAsnGroup(@Param("groupName")String groupName); - void updateIsAuditAll(@Param("groupType")Integer groupType,@Param("isAuditAll")Integer isAuditAll,@Param("groupIds")List groupIds); - void updateIsUsed(@Param("groupType")Integer groupType,@Param("isUsed")Integer isUsed,@Param("groupIds")List groupIds); } diff --git a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml index c182b566f..252839bd5 100644 --- a/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/specific/ConfigGroupInfoDao.xml @@ -10,12 +10,11 @@ - - + - id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id,asn_id,is_audit_all + id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id,asn_id - insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id,asn_id,is_audit_all,is_used) - values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType},#{compileId},#{asnId},#{isAuditAll},#{isUsed}) + insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id,asn_id) + values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType},#{compileId},#{asnId}) - insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id,asn_id,is_audit_all,is_used) + insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id,asn_id) values - (#{info.id},#{info.groupId},#{info.groupName},#{info.isIssued},now(),#{info.groupType},#{info.compileId},#{info.asnId},#{info.isAuditAll},#{info.isUsed}) + (#{info.id},#{info.groupId},#{info.groupName},#{info.isIssued},now(),#{info.groupType},#{info.compileId},#{info.asnId}) @@ -63,16 +62,16 @@ where group_id = #{groupId}
- - - @@ -138,7 +135,7 @@ $(function(){
- readonly="readonly"/> +
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp new file mode 100644 index 000000000..267c88485 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp @@ -0,0 +1,34 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + +
+
+ +
+
+
+
+
+ <%-- --%> +
+ +
+ <%-- --%> + +
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp index 9dde0f0ae..34343a150 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp @@ -27,31 +27,61 @@ } } //hide actions - /* if(isAsn==1){ + if(isAsn==1){ hideAction(0,asnRegionCode); }else{ hideAction(1,asnRegionCode); - } */ - /* $("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click();*/ - if($(".action:checked").val()==32){ - $(".subscribeId").find(".glyphicon-remove").click(); - $(".subscribeId").prev("h4").addClass("hidden"); - $(".asnRegionV").find(".glyphicon-remove").click(); - $(".asnRegionV").prev("h4").addClass("hidden"); } - var regionCodes=$(".action:checked").attr("regionCode").split(","); - $("h4[class*='ipPortListTitle']").each(function(){ - var has=false; - for(var ind in regionCodes){ - if($(this).hasClass("ipPortListTitle"+regionCodes[ind])){ - has=true; + if(isAsn==0){ + $("[class~='glyphicon-plus'][class~='ipPortList']").click(); + $("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click(); + /*if(action==32){ + $(".subscribeId").find(".glyphicon-remove").click(); + $(".subscribeId").prev("h4").addClass("hidden"); + }*/ + var regionCodes=$(".action:checked").attr("regionCode").split(","); + $("h4[class*='ipPortListTitle']").each(function(){ + var has=false; + for(var ind in regionCodes){ + if($(this).hasClass("ipPortListTitle"+regionCodes[ind])){ + has=true; + } } + if(!has){ + $(this).addClass("hidden"); + } + }); + processAction(isAsn,$(".ipPortList")); + }else{ + $("[class~='glyphicon-plus'][class~='asn']").click(); + $("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click(); + processAction(isAsn,$(".asn")); + } + //隐藏显示asn + if($("[name='action']:checked").val()==32||$("[name='action']:checked").val()==64){ + console.log(111); + $("h4.form-section.asn").addClass("hidden"); + }else{ + $("h4.form-section.asn").removeClass("hidden"); + } + $(".glyphicon-plus").on("click",function(){ + if($(this).hasClass("ipPortList")){ + isAsn=0; + hideAction(1,asnRegionCode); + $("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click(); } - if(!has){ - $(this).addClass("hidden"); + if($(this).hasClass("asn")){ + isAsn=1; + hideAction(0,asnRegionCode); + $("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click(); } }); - processAction(isAsn,$(".ipPortList")); + //处理asn id + $(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId")); + $(".asn").find("select[name='userRegion4']").on("change",function(){ + var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId"); + $(this).parents(".row").find("input[name='userRegion5']").val(asnId); + }); $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); @@ -80,16 +110,15 @@ $(this).attr("name",'cfgRegionCode'); $("#cfgType"+$(this).val()).attr("name",'cfgType'); } - }); + }); var tabInfo=$(".ipPortList"); if(tabInfo){ tabInfo.find("[name$='cfgType']").val(cfgType); tabInfo.find("[name$='cfgRegionCode']").val(cfgRegionCode); } - - /*if(isAsn==0){ + if(isAsn==0){ changeIPVal(tabInfo); - } */ + } processAction(isAsn,tabInfo); /* if(tabInfo){ tabInfo.find("[name$='cfgType']").val(cfgType); @@ -98,11 +127,8 @@ if($(this).val()==32||$(this).val()==96){ $(".subscribeId").find(".glyphicon-remove").click(); $(".subscribeId").prev("h4").addClass("hidden"); - $(".asnRegionV").find(".glyphicon-remove").click(); - $(".asnRegionV").prev("h4").addClass("hidden"); }else{ $(".subscribeId").prev("h4").removeClass("hidden"); - $(".asnRegionV").prev("h4").removeClass("hidden"); } //处理ICMP if($(this).val()==32){ @@ -119,20 +145,17 @@ } */ //隐藏显示asn - /* if($(this).val()==32||$(this).val()==64){ + if($(this).val()==32||$(this).val()==64){ $("h4.form-section.asn").addClass("hidden"); }else{ $("h4.form-section.asn").removeClass("hidden"); - } */ + } }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); $(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){ switchRateLimitType(); }) - if($("input[name='cfgId']").val() == null || $("input[name='cfgId']").val() == ''){ - $(".glyphicon-plus").first().click(); - } $("#cfgFrom").validate( { errorPlacement : function(error, element) { @@ -150,14 +173,14 @@ subscribeId=1; } //代表所有业务都隐藏了，提示必须增加一种业务数据 - var boxSolidLenth=$(".boxSolid").length; + /* var boxSolidLenth=$(".boxSolid").length; if($(".boxSolid").hasClass("subscribeId")){ boxSolidLenth=boxSolidLenth-1; } if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ top.$.jBox.tip("", ""); return; - } + } */ //代表所有区域都隐藏了，提示必须增加个区域信息 if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); @@ -196,10 +219,10 @@ flag=flag1; } if(flag){ - /* if(isAsn==0){ + if(isAsn==0){ $("input[name='userRegion4']").attr("disabled",true); $("input[name='userRegion5']").attr("disabled",true); - } */ + } $("input[name$='userRegion1']").attr("disabled",false); $("input[name$='exprType']").attr("disabled",false); //将disable属性的元素删除 @@ -304,12 +327,12 @@ var processAction=function(configType,obj){ var selectedProtocol=o.find("select[name$='protocol'] option:selected").attr("value"); if(action==32){ //先清空，再添加 - o.find("select[name$='protocol']").empty(); + /* o.find("select[name$='protocol']").empty(); $.ipcommon.protocol.each(function(){ - if($(this).attr("value")==6||$(this).attr("value")==17||$(this).attr("value")==1||$(this).attr("value")==50||$(this).attr("value")==15||$(this).attr("value")==51){ + if($(this).attr("value")==0||$(this).attr("value")==6||$(this).attr("value")==17||$(this).attr("value")==1||$(this).attr("value")==8||$(this).attr("value")==15){ o.find("select[name$='protocol']").append($(this)); } - }) + }) */ $(".ratelimitAction").addClass("hidden"); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else if(action==16){ @@ -324,12 +347,12 @@ var processAction=function(configType,obj){ $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else if(action==64){ //先清空，再添加 - o.find("select[name$='protocol']").empty(); + /* o.find("select[name$='protocol']").empty(); $.ipcommon.protocol.each(function(){ - if($(this).attr("value")==6||$(this).attr("value")==17){ + if($(this).attr("value")==0||$(this).attr("value")==6||$(this).attr("value")==17){ o.find("select[name$='protocol']").append($(this)); } - }) + }) */ $(".ratelimitAction").removeClass("hidden"); var rateLimitType=$("input[name='userRegion1']:checked").val(); if(rateLimitType == 0){//丢包率 @@ -367,8 +390,6 @@ var processAction=function(configType,obj){ } } - //drop动作不展示asn信息 - } } @@ -676,21 +697,20 @@ var showHideIPSECProtocol=function(obj){ -

+

- - + - + -
- <%@include file="/WEB-INF/views/cfg/asnForm.jsp"%> +
+ <%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
@@ -698,15 +718,15 @@ var showHideIPSECProtocol=function(obj){ -