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

1、增加SubscribeId分组配置功能 2、增加公共分组相关国际化代码及相关sql文件修改

Browse Source
This commit is contained in:
zhangwenqing
2019-06-10 18:31:52 +08:00
parent 66b3673bce
commit bf03ca1cc0
59 changed files with 4394 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/com/nis/web/controller/basics/IpCommGroupController.java
View File

@@ -33,6 +33,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.template.IpCommCfgTemplate;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
@@ -159,11 +160,20 @@ public class IpCommGroupController extends BaseController {
Page<IpCommCfg> page = ipCommGroupCfgService.findPage(pageInfo, entity);
list = page.getList();
}
CommonGroupInfo groupInfo = new CommonGroupInfo();
for (IpCommCfg cfg : list) {
groupInfo.setServiceGroupId(cfg.getGroupId());
CommonGroupInfo commonGroupInfo = commonGroupManageService.getGroupInfo(groupInfo);
cfg.setGroupName(commonGroupInfo.getGroupName());
}
titleList.add(entity.getMenuNameCode());
classMap.put(entity.getMenuNameCode(), IpPortCfg.class);
classMap.put(entity.getMenuNameCode(), IpCommCfg.class);
String cfgIndexInfoNoExport = ",block_type,do_log,action"
+ ",letter,whether_area_block,classification,attribute,label"
+ ",userregion1,userregion2,userregion3,userregion4,userregion5,src_ip_pattern,client_ip,src_port_pattern,client_port,dest_ip_pattern,dest_port_pattern,dest_port,";
+ ",letter,whether_area_block,classification,attribute,label,userregion1,userregion2,userregion3,userregion4,userregion5"
+ ",src_ip_pattern,src_port_pattern,client_port,dest_ip_pattern,dest_port_pattern,server_port,cfg_id,is_audit,auditor,valid_identifier,ir_type,";
// 时间过滤
if (entity.getSearch_create_time_start() == null) {
cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
@@ -198,7 +208,8 @@ public class IpCommGroupController extends BaseController {
}
}
// 数据导入
@RequestMapping(value = "import", method=RequestMethod.POST)
public String importIp(HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
@RequestParam("files") MultipartFile[] files, Integer serviceDictId ,Integer requestId ,String attribute ,String classify
@@ -210,7 +221,7 @@ public class IpCommGroupController extends BaseController {
FunctionServiceDict serviceDict = DictUtils.getFunctionServiceDict(serviceDictId);
StringBuffer errTip=new StringBuffer();
BlockingQueue<BaseIpCfg> ipPortCfgs =null;
//List<CfgIndexInfo> cfgIndexInfos = new ArrayList<CfgIndexInfo>();
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
ei = new ImportBigExcel(file, 0, 1);
@@ -234,8 +245,16 @@ public class IpCommGroupController extends BaseController {
List<BaseIpCfg> _ipPortCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
while(!ipPortCfgs.isEmpty()) {
ipPortCfgs.drainTo(_ipPortCfgs, Constants.MAAT_JSON_SEND_SIZE);
List<Integer> regionIds = Lists.newArrayList(_ipPortCfgs.size());
try {
regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
} catch (Exception e) {
e.printStackTrace();
logger.info("获取域ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
int ind=0;
int index = 0;
for (BaseIpCfg cfg : _ipPortCfgs) {
cfg.setAction(serviceDict==null?null:serviceDict.getAction());
cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
@@ -245,15 +264,8 @@ public class IpCommGroupController extends BaseController {
//cfg.setDoLog(2);
cfg.setCompileId(0);
cfg.setFunctionId(regionDict.getFunctionId());
if(isSend.equals("1")) {
cfg.setIsAudit(Constants.AUDIT_YES);
cfg.setIsValid(Constants.VALID_YES);
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(date);
}else {
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setIsValid(Constants.VALID_NO);
}
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAreaEffective(0);
cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
@@ -261,12 +273,14 @@ public class IpCommGroupController extends BaseController {
cfg.setClassify(classify);
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("ip_comm_cfg");
ind++;
cfg.setRegionId(regionIds.get(index));
index++;
}
ipCommGroupCfgService.saveAndSend(regionDict, serviceDict, _ipPortCfgs,isSend.equals("1"));
ipCommGroupCfgService.saveAndSend(regionDict, serviceDict, _ipPortCfgs);
_ipPortCfgs.clear();
}
}
}
if(errTip.toString().length()>0) {
@@ -294,16 +308,4 @@ public class IpCommGroupController extends BaseController {
return "redirect:" + adminPath+ importPath;
}
/*@ResponseBody
@RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
public Map<Integer,String> ajaxGetGroups(Model model,@RequestParam(required=true,value="groupIds")String groupIds){
Map<Integer,String> groupIdList=new HashMap<Integer,String>();
if(StringUtils.isNotBlank(groupIds)) {
List<PolicyGroupInfo> list=policyGroupInfoService.findPolicyByGroupInfoList(groupIds);
for(PolicyGroupInfo p:list) {
groupIdList.put(p.getGroupId(), p.getGroupName());
}
}
return groupIdList;
}*/
}