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

asn 相关修改提交

Browse Source 
(1)asn_ip_cfg增加四列
(2)新增asn_group_info表
(3)asn ip菜单移动到policy object下，新增审核审计菜单
(4)asn ip导入修改,适应新的需求放弃了使用AsnCache，直接从数据库查
(5)asn ip加入审核流程
(6)Packet IP选择asn时，改为选中一个组织，审核下发的配置为as号字符串域
(7)asn ip 新增业务新增function_service_dict字典，serviceId为400
This commit is contained in:
wangxin
2019-01-04 18:28:57 +06:00
parent 429b1841f1
commit 85507b5a55
44 changed files with 2596 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/main/java/com/nis/web/controller/basics/AsnGroupController.java Normal file
View File

@@ -0,0 +1,157 @@
package com.nis.web.controller.basics;
import java.util.Properties;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.AsnGroupInfo;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
/**
* 协议分组
* @author dell
*
*/
@Controller
@RequestMapping(value = "${adminPath}/basics/asnGroup")
public class AsnGroupController extends BaseController {
//@RequiresPermissions(value={"basics:asnGroup:view"},logical=Logical.OR)
@RequestMapping(value = {"/asnGroupList", ""})
public String asnGroupList(AsnGroupInfo cfg,HttpServletRequest request
, HttpServletResponse response, Model model
,RedirectAttributes redirectAttributes) {
if(cfg == null)cfg=new AsnGroupInfo();
Page<AsnGroupInfo> pageCondition = new Page<AsnGroupInfo>(request, response,"r");
Page page = asnGroupInfoService.findAsnGroupInfoList(pageCondition,cfg);
model.addAttribute("cfg", cfg);
model.addAttribute("page", page);
return "/basics/asnGroupList";
}
/**
* 进入添加或修改页面
* @param serviceDictInfo
* @param model
* @return
*/
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
@RequestMapping(value={"/asnGroupForm"})
public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
AsnGroupInfo asnGroup=new AsnGroupInfo();
if(!StringUtil.isEmpty(ids)){
asnGroup=asnGroupInfoService.getById(Integer.parseInt(ids));
}
model.addAttribute("_cfg", asnGroup);
return "/basics/asnGroupForm";
}
/**
* 新增或修改
* @return
*/
//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(AsnGroupInfo cfg,Model model,
RedirectAttributes redirectAttributes,String itType) {
try {
AsnGroupInfo asnGroup=asnGroupInfoService.getGroupIdByNameAndASNId(cfg.getOrganization().trim(), cfg.getCountry().trim(), cfg.getAsnId());
if(asnGroup!=null) {
Properties props=this.getMsgProp();
addMessage(redirectAttributes,"error","ASN "+props.getProperty("repeat", "Repeat"));
}
asnGroupInfoService.saveOrUpdate(cfg);
addMessage(redirectAttributes,"success","save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes,"error","save_failed");
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
}
/**
* 删除
* @return
*/
//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds) {
try {
asnGroupInfoService.delete(ids,asnIds);
addMessage(redirectAttributes,"success","delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes,"error","delete_failed");
}
return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
}
@RequestMapping(value="ajaxGetAuditedIP",method=RequestMethod.POST)
@ResponseBody
public boolean ajaxGetAuditedIP(Model model,@RequestParam(required=true,value="asnIds")String asnIds){
if(StringUtils.isNotBlank(asnIds)) {
return asnGroupInfoService.checkIps(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,
@RequestParam(required=true,value="detail")String detail,@RequestParam(required=true,value="asnId")Long asnId){
if(StringUtils.isNotBlank(organization)) {
AsnGroupInfo info= asnGroupInfoService.getGroupIdByNameAndASNId(organization,country,asnId);
if(info==null) {
return 0;
}else if(id!=null&&info.getId().longValue()==id.longValue()){
return 0;
}else if(id!=null&&info.getId().longValue()!=id.longValue()){
return 1;
}
}
return 0;
}
// @RequestMapping(value="asnGroupName1",method=RequestMethod.POST)
// @ResponseBody
// public String asnGroupName1(Model model,@RequestParam(required=true,value="id")Long id,@RequestParam(required=true,value="organization")String organization,@RequestParam(required=true,value="country")String country,
// @RequestParam(required=true,value="detail")String detail,@RequestParam(required=true,value="asnId")Long asnId){
// if(StringUtils.isNotBlank(organization)) {
// AsnGroupInfo info= asnGroupInfoService.getGroupIdByNameAndASNId(organization,country,asnId);
// if(info==null) {
// return "";
// }else if(info.get) {
//
// }
// }
// return 0;
// }
/**
* 校验asn号是否已存在
*/
@ResponseBody
@RequestMapping(value = {"/checkAsnNo"})
public boolean checkIp(AsnGroupInfo cfg, HttpServletRequest request, HttpServletResponse response){
AsnGroupInfo policyGroup = asnGroupInfoService.getInfoByAsnNo(cfg);
if(policyGroup == null){
return true;
}
return false;
}
}

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

@@ -1,14 +1,17 @@
package com.nis.web.controller.basics;
package com.nis.web.controller.basics;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -17,26 +20,33 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Maps;
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.PolicyGroupInfo;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.AsnCacheUtils;
//import com.nis.util.AsnCacheUtils;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
import jersey.repackaged.com.google.common.collect.Lists;
@Controller
@RequestMapping(value = "${adminPath}/basics/asn")
public class AsnIpController extends BaseController{
@RequestMapping(value = {"/list"})
public String list(Model model,HttpServletRequest request
,HttpServletResponse response,@ModelAttribute("cfg")AsnIpCfg entity
,RedirectAttributes redirectAttributes){
){
Page<AsnIpCfg> page = asnIpCfgService.findPage(new Page<AsnIpCfg>(request, response,"r"), entity);
model.addAttribute("page", page);
// initPageCondition(model);
@@ -44,12 +54,6 @@ public class AsnIpController extends BaseController{
model.addAttribute("regionList", regionList);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
model.addAttribute("serviceList", serviceList);
// List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
// model.addAttribute("policyGroups", policyGroups);
// AsnCacheUtils.init(false);
// List<ConfigGroupInfo> policyGroups=AsnCacheUtils.getAllAsnGroup();
// model.addAttribute("policyGroups", policyGroups);
return "/basics/asnIpCfgList";
}
@RequestMapping(value = {"/addForm"})
@@ -57,8 +61,8 @@ public class AsnIpController extends BaseController{
,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
,RedirectAttributes redirectAttributes){
initFormCondition(model,cfg);
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
model.addAttribute("policyGroups", policyGroups);
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
model.addAttribute("policyGroups", groupInfos);
model.addAttribute("_cfg", cfg);
return "/basics/asnIpCfgFormAdd";
}
@@ -68,8 +72,8 @@ public class AsnIpController extends BaseController{
,RedirectAttributes redirectAttributes){
cfg = asnIpCfgService.get(Long.parseLong(ids));
initUpdateFormCondition(model, cfg);
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4);
model.addAttribute("policyGroups", policyGroups);
List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
model.addAttribute("policyGroups", groupInfos);
model.addAttribute("_cfg", cfg);
return "/basics/asnIpCfgFormUpdate";
}
@@ -106,13 +110,64 @@ public class AsnIpController extends BaseController{
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"/audit"})
@RequiresPermissions(value={"asn:ip:confirm"})
public String audit(Model model,@ModelAttribute("cfg")AsnIpCfg cfg
,Integer isAudit
,Integer isValid
,String ids
,Integer functionId
, HttpServletRequest request
,HttpServletResponse response
,RedirectAttributes redirectAttributes) {
//选中配置审核
if(!StringUtil.isEmpty(ids)) {
List<AsnIpCfg> asnIps=asnIpCfgService.getByIds(ids);
Map<Long,List<AsnIpCfg>> asnIpMap=Maps.newHashMap();
for(AsnIpCfg asnIpCfg:asnIps) {
asnIpCfg.setIsAudit(isAudit);
asnIpCfg.setIsValid(isValid);
asnIpCfg.setAuditorId(UserUtils.getUser().getId());
asnIpCfg.setAuditTime(new Date());
asnIpCfg.setFunctionId(functionId);
if(asnIpMap.containsKey(Long.parseLong(asnIpCfg.getUserRegion1()))) {
asnIpMap.get(Long.parseLong(asnIpCfg.getUserRegion1())).add(asnIpCfg);
}else {
List<AsnIpCfg> _asnIps=Lists.newArrayList();
_asnIps.add(asnIpCfg);
asnIpMap.put(Long.parseLong(asnIpCfg.getUserRegion1()), _asnIps);
}
}
asnIpCfgService.auditIpBatch(asnIpMap,isValid);
}/*else {
//条件下所有配置审核
Page<AsnIpCfg> searchPage=new Page<AsnIpCfg>(request,response,"a");
Page<AsnIpCfg> auditPage=new Page<AsnIpCfg>(request,response,"a");
BeanUtils.copyProperties(searchPage, auditPage);
try {
auditAll(auditPage,isValid , cfg);
addMessage(redirectAttributes,"success", "audit_success");
} catch (Exception e) {
logger.error("配置下发失败：",e);
if(e instanceof MaatConvertException) {
addMessage(redirectAttributes,"error", "request_service_failed");
}else {
addMessage(redirectAttributes,"error", "audit_failed");
}
}
return list(model, request, response, cfg);
}*/
return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
}
@RequestMapping(value = {"/delete"})
@RequiresPermissions(value={"asn:ip:config"})
public String delete(Integer isValid
,String ids,Integer functionId
,RedirectAttributes redirectAttributes){
try{
asnIpCfgService.delete(isValid,ids);
asnIpCfgService.delete(ids);
addMessage(redirectAttributes,"success","delete_success");
}catch(Exception e){
logger.error("Delete failed",e);
@@ -134,35 +189,13 @@ public class AsnIpController extends BaseController{
logger.error("Delete failed",e);
}
}
/**
* ajax设置Name
* @param model
* @param ids
* @return
*/
@RequestMapping(value="ajaxGroupName",method=RequestMethod.POST)
@RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
@ResponseBody
public Map<String, String> ajaxGroupName(Model model,String ids){
AsnCacheUtils.init(false);
Map<String, String> groupMap=new HashMap<>();
for(String id:ids.split(",")) {
ConfigGroupInfo info=AsnCacheUtils.get(Long.parseLong(id));
if(info!=null) {
groupMap.put(id, info.getGroupName());
}else {
info=asnIpCfgService.getConfigGroupInfoByAsnNo(Long.parseLong(id));
groupMap.put(id, info.getGroupName());
}
public List<AsnGroupInfo> ajaxGetGroups(Model model,@RequestParam(required=true,value="org")String org){
if(StringUtils.isNotBlank(org)) {
return asnGroupInfoService.getByOrg(org);
}
return groupMap;
}
@RequestMapping(value="ajaxServiceIdState",method=RequestMethod.POST)
@ResponseBody
public boolean ajaxServiceIdState(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds){
if(StringUtils.isNotBlank(serviceGroupIds)) {
return policyGroupInfoService.checkIsIssued(serviceGroupIds);
}
return false;
return new ArrayList<AsnGroupInfo>();
}
@RequestMapping(value="ajaxIsLast",method=RequestMethod.POST)
@ResponseBody