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

(1)asn导入加入组织国家，asn号验证，组织国家不能为空，asn号不能为两个组织所有

Browse Source 
(2)新增asn_keyword_cfg表，用于保存并下发有效且含审核通过asn ip的 asn号
(3)asn 导入去除条数限制
(4)页面asn select选项还是会影响加载页面速度，现在改为input
(5)asn_group_info 修改org_group_id为issued_ips，用于保存审核通过的asn ip
(6)分组复用url配置文件补全v1
This commit is contained in:
wangxin
2019-01-06 11:24:49 +08:00
parent 9979bb26b2
commit f56a0fe09a
37 changed files with 968 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/web/controller/basics/AsnGroupController.java
View File

@@ -16,6 +16,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.domain.basics.AsnIpCfg;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
@@ -110,6 +112,14 @@ public class AsnGroupController extends BaseController {
}
return false;
}
@RequestMapping(value="ajaxGetAuditedIPAddress",method=RequestMethod.POST)
@ResponseBody
public boolean ajaxGetAuditedIPAddress(Model model,@RequestParam(required=true,value="asnIds")String asnIds){
if(StringUtils.isNotBlank(asnIds)) {
return asnGroupInfoService.checkIpAddrs(asnIds);
}
return false;
}
@RequestMapping(value="asnGroupName",method=RequestMethod.POST)
@ResponseBody
public Integer asnGroupName(Model model,@RequestParam(required=true,value="id")Long id,@RequestParam(required=true,value="organization")String organization,@RequestParam(required=true,value="country")String country,
@@ -154,4 +164,19 @@ public class AsnGroupController extends BaseController {
return false;
}
/**
* 校验asn号是否已存在
*/
@ResponseBody
@RequestMapping(value = {"/orgMustExists"})
public boolean orgMustExists(AsnIpCfg cfg, HttpServletRequest request, HttpServletResponse response){
cfg.setIsValid(1);
AsnIpCfg asnIpCfg=asnIpCfgService.getOne(cfg);
if(asnIpCfg == null){
return false;
}
return true;
}
}

12
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -61,8 +61,8 @@ public class AsnIpController extends BaseController{
,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
,RedirectAttributes redirectAttributes){
initFormCondition(model,cfg);
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
model.addAttribute("policyGroups", groupInfos);
//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
//model.addAttribute("policyGroups", groupInfos);
model.addAttribute("_cfg", cfg);
return "/basics/asnIpCfgFormAdd";
}
@@ -72,8 +72,8 @@ public class AsnIpController extends BaseController{
,RedirectAttributes redirectAttributes){
cfg = asnIpCfgService.get(Long.parseLong(ids));
initUpdateFormCondition(model, cfg);
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
model.addAttribute("policyGroups", groupInfos);
//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
//model.addAttribute("policyGroups", groupInfos);
model.addAttribute("_cfg", cfg);
return "/basics/asnIpCfgFormUpdate";
}
@@ -181,14 +181,14 @@ public class AsnIpController extends BaseController{
return "redirect:" + adminPath +"/basics/asn/list?functionId="+functionId;
}
@RequestMapping(value = {"/ajaxDeleteAsnIp"})
/*@RequestMapping(value = {"/ajaxDeleteAsnIp"})
public void ajaxDeleteAsnIp(String ids, HttpServletRequest request, HttpServletResponse response){
try{
asnIpCfgService.ajaxDeleteAsnIp(ids);
}catch(Exception e){
logger.error("Delete failed",e);
}
}
}*/
@RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
@ResponseBody
public List<AsnGroupInfo> ajaxGetGroups(Model model,@RequestParam(required=true,value="org")String org){