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

分组配置管理GroupName改为可手动输入

Browse Source
This commit is contained in:
zhangwenqing
2019-06-14 17:12:41 +08:00
parent 3aebe7d905
commit d245ef7dc4
33 changed files with 2384 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -45,7 +45,14 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
protected Integer specServiceId;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用
protected String domain;//仅用于copy属性使用 protected String domain;//仅用于copy属性使用
protected Integer dnsStrategyId;//仅用作复制属性使用 protected Integer dnsStrategyId;//仅用作复制属性使用
protected String groupName;
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public Integer getDnsStrategyId() { public Integer getDnsStrategyId() {
return dnsStrategyId; return dnsStrategyId;
} }

7
src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
View File

@@ -96,6 +96,7 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
private List<IpCommCfg> ipCommGroupCfgList; private List<IpCommCfg> ipCommGroupCfgList;
private List<DomainCommCfg> domainCommGroupList; private List<DomainCommCfg> domainCommGroupList;
private List<ScriberIdCommCfg> scriberIdCommGroupList; private List<ScriberIdCommCfg> scriberIdCommGroupList;
private String groupName;
/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数 /*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
@@ -108,6 +109,12 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
public String getOrganization() { public String getOrganization() {
return organization; return organization;
} }
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
public List<IpCommCfg> getIpCommGroupCfgList() { public List<IpCommCfg> getIpCommGroupCfgList() {
return ipCommGroupCfgList; return ipCommGroupCfgList;
} }

12
src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java
View File

@@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField;
public class DomainCommCfgTemplate extends StringAllNotDoLogTemplate{ public class DomainCommCfgTemplate extends StringAllNotDoLogTemplate{
@ExcelField(title="group_name",align=2,sort=10) @ExcelField(title="group_name",align=2,sort=10)
private Integer groupId; private String groupName;
public Integer getGroupId() { public String getGroupName() {
return groupId; return groupName;
} }
public void setGroupId(Integer groupId) { public void setGroupName(String groupName) {
this.groupId = groupId; this.groupName = groupName;
} }
} }

45
src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java
View File

@@ -3,45 +3,18 @@ package com.nis.domain.configuration.template;
import com.nis.util.excel.ExcelField; import com.nis.util.excel.ExcelField;
public class IpCommCfgTemplate extends IpAllNotDoLogTemplate{ public class IpCommCfgTemplate extends IpAllNotDoLogTemplate{
@ExcelField(title="group_name",align=2,sort=10) @ExcelField(title="group_name",align=2,sort=10)
private Integer groupId; private String groupName;
public Integer getGroupId() { public String getGroupName() {
return groupId; return groupName;
} }
public void setGroupId(Integer groupId) { public void setGroupName(String groupName) {
this.groupId = groupId; this.groupName = groupName;
} }
/* @Override
public String getSrcIpAddress() {
// TODO Auto-generated method stub
return super.getSrcIpAddress();
}
@Override
public String getSrcPort() {
// TODO Auto-generated method stub
return super.getSrcPort();
}
@Override
public String getDestPort() {
// TODO Auto-generated method stub
return super.getDestPort();
}
@Override
public Integer getProtocol() {
// TODO Auto-generated method stub
return super.getProtocol();
}
@Override
public Integer getDirection() {
// TODO Auto-generated method stub
return super.getDirection();
}*/
} }

12
src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java
View File

@@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField;
public class ScriberIdCommCfgTemplate extends StringAllNotDoLogTemplate{ public class ScriberIdCommCfgTemplate extends StringAllNotDoLogTemplate{
@ExcelField(title="group_name",align=2,sort=10) @ExcelField(title="group_name",align=2,sort=10)
private Integer groupId; private String groupName;
public Integer getGroupId() { public String getGroupName() {
return groupId; return groupName;
} }
public void setGroupId(Integer groupId) { public void setGroupName(String groupName) {
this.groupId = groupId; this.groupName = groupName;
} }
} }

12
src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java
View File

@@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField;
public class UrlCommCfgTemplate extends StringAllNotDoLogTemplate{ public class UrlCommCfgTemplate extends StringAllNotDoLogTemplate{
@ExcelField(title="group_name",align=2,sort=10) @ExcelField(title="group_name",align=2,sort=10)
private Integer groupId; private String groupName;
public Integer getGroupId() { public String getGroupName() {
return groupId; return groupName;
} }
public void setGroupId(Integer groupId) { public void setGroupName(String groupName) {
this.groupId = groupId; this.groupName = groupName;
} }
} }

4
src/main/java/com/nis/util/DictUtils.java
View File

@@ -408,7 +408,7 @@ public class DictUtils {
/** /**
* 获取公共组字典缓存 * 获取公共组字典缓存
*/ */
public static List<CommonGroupInfo> getCommonGroups(Integer groupType){ /*public static List<CommonGroupInfo> getCommonGroups(Integer groupType){
String dictKey = Constants.CACHE_IPGROUP_DICT; String dictKey = Constants.CACHE_IPGROUP_DICT;
if(groupType.equals(7)) { if(groupType.equals(7)) {
dictKey = Constants.CACHE_URLGROUP_DICT; dictKey = Constants.CACHE_URLGROUP_DICT;
@@ -436,6 +436,6 @@ public class DictUtils {
} }
} }
return null; return null;
} }*/
} }

10
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -470,17 +470,17 @@ public class ExportExcel {
commentStr=""; commentStr="";
List<PolicyGroupInfo> list = null; List<PolicyGroupInfo> list = null;
if(region.getFunctionId().equals(605)) { if(region.getFunctionId().equals(605)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(5); list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE);
}else if(region.getFunctionId().equals(606)) { }else if(region.getFunctionId().equals(606)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(7); list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE);
}else if(region.getFunctionId().equals(607)) { }else if(region.getFunctionId().equals(607)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(8); list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE);
}else if(region.getFunctionId().equals(608)) { }else if(region.getFunctionId().equals(608)) {
list=policyGroupInfoDao.findPolicyGroupInfosByType(9); list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE);
} }
if(!StringUtil.isEmpty(list)){ if(!StringUtil.isEmpty(list)){
for (PolicyGroupInfo policyGroupInfo : list) { for (PolicyGroupInfo policyGroupInfo : list) {
commentStr=commentStr+policyGroupInfo.getServiceGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n"; commentStr=commentStr+policyGroupInfo.getGroupName()+"\n";
index++; index++;
} }
} }

15
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -835,20 +835,7 @@ public class CheckIpFormatThread implements Callable<String>{
} }
} }
} }
// IP公共组配置
if(regionDict.getFunctionId().equals(605)) {
Integer groupId = baseIpCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 5);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if (regionDict.getRegionType().equals(1)) { if (regionDict.getRegionType().equals(1)) {
boolean srcIpEmpty = false; boolean srcIpEmpty = false;
boolean destIpEmpty = false; boolean destIpEmpty = false;

35
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -132,41 +132,6 @@ public class CheckStringFormatThread implements Callable<String>{
} }
// doLog属性检验 // doLog属性检验
this.validDoLog(baseStringCfg,errInfo); this.validDoLog(baseStringCfg,errInfo);
// URL、Domain、ScriberId公共组配置
if(regionDict.getFunctionId().equals(606)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 7);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if(regionDict.getFunctionId().equals(607)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 8);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if(regionDict.getFunctionId().equals(608)) {
Integer groupId = baseStringCfg.getGroupId();
if (groupId != null) {
CommonGroupInfo groupInfo = DictUtils.getCommonGroups(groupId, 9);
if (groupInfo == null) {
errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("group_name"))+ ";");
}
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("group_name") + " ") + ";");
}
}
if (regionDict.getRegionType().equals(2)) { if (regionDict.getRegionType().equals(2)) {
if (regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) { if (regionDict.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) {

6
src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java
View File

@@ -90,6 +90,12 @@ public class CommonGroupManageController extends BaseController {
return commonGroupManageService.ajaxCheckIsLastOneCfg(grouIdAndCfgId, groupType); return commonGroupManageService.ajaxCheckIsLastOneCfg(grouIdAndCfgId, groupType);
} }
@ResponseBody
@RequestMapping(value="ajaxGetGroupInfoByType",method=RequestMethod.GET)
public List<CommonGroupInfo> ajaxGetGroupInfoByType(Integer groupType){
return commonGroupManageService.findCommonGroupInfosByType(groupType);
}
// 数据导出 // 数据导出
@RequestMapping(value = "exportGroup") @RequestMapping(value = "exportGroup")
public void exportGroup(Model model,@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes, public void exportGroup(Model model,@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes,

9
src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java
View File

@@ -52,7 +52,7 @@ public class DomainCommGroupController extends BaseController{
Page<DomainCommCfg> page = domainCommGroupService.findPage(new Page<DomainCommCfg>(request, response,"r"), entity); Page<DomainCommCfg> page = domainCommGroupService.findPage(new Page<DomainCommCfg>(request, response,"r"), entity);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(8); List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("regionList", regionList); model.addAttribute("regionList", regionList);
@@ -65,8 +65,8 @@ public class DomainCommGroupController extends BaseController{
public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes,
HttpServletRequest request, HttpServletResponse response){ HttpServletRequest request, HttpServletResponse response){
initFormCondition(model,cfg); initFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(8); /* List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);*/
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/domainCommGroupFormAdd"; return "/basics/domainCommGroupFormAdd";
@@ -96,7 +96,7 @@ public class DomainCommGroupController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
cfg = domainCommGroupService.get(Long.parseLong(ids)); cfg = domainCommGroupService.get(Long.parseLong(ids));
initUpdateFormCondition(model,cfg); initUpdateFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(8); List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/domainCommGroupFormUpdate"; return "/basics/domainCommGroupFormUpdate";
@@ -198,6 +198,7 @@ public class DomainCommGroupController extends BaseController{
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("domain_comm_cfg"); cfg.setTableName("domain_comm_cfg");
cfg.setRegionId(regionIds.get(index)); cfg.setRegionId(regionIds.get(index));
cfg.setGroupName(cfg.getGroupName().toUpperCase());
index++; index++;
} }

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

@@ -30,7 +30,6 @@ import com.nis.domain.basics.CommonGroupInfo;
import com.nis.domain.basics.IpCommCfg; import com.nis.domain.basics.IpCommCfg;
import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.template.IpCommCfgTemplate; import com.nis.domain.configuration.template.IpCommCfgTemplate;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
@@ -54,7 +53,7 @@ public class IpCommGroupController extends BaseController {
Page<IpCommCfg> page = ipCommGroupCfgService.findPage(new Page<IpCommCfg>(request, response, "r"),entity); Page<IpCommCfg> page = ipCommGroupCfgService.findPage(new Page<IpCommCfg>(request, response, "r"),entity);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
List<CommonGroupInfo> policyGroupInfos=commonGroupManageService.findCommonGroupInfosByType(5); List<CommonGroupInfo> policyGroupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("regionList", regionList); model.addAttribute("regionList", regionList);
@@ -70,8 +69,8 @@ public class IpCommGroupController extends BaseController {
cfg.setGroupType(5); cfg.setGroupType(5);
initFormCondition(model, cfg); initFormCondition(model, cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(5); /*List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(5);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);*/
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/ipCommGroupFormAdd"; return "/basics/ipCommGroupFormAdd";
} }
@@ -102,7 +101,7 @@ public class IpCommGroupController extends BaseController {
cfg.setGroupType(5); cfg.setGroupType(5);
initUpdateFormCondition(model, cfg); initUpdateFormCondition(model, cfg);
List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(5); List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/ipCommGroupFormUpdate"; return "/basics/ipCommGroupFormUpdate";
@@ -274,6 +273,7 @@ public class IpCommGroupController extends BaseController {
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("ip_comm_cfg"); cfg.setTableName("ip_comm_cfg");
cfg.setRegionId(regionIds.get(index)); cfg.setRegionId(regionIds.get(index));
cfg.setGroupName(cfg.getGroupName().toUpperCase());
index++; index++;
} }

9
src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java
View File

@@ -52,7 +52,7 @@ public class ScriberIdCommGroupController extends BaseController{
Page<ScriberIdCommCfg> page = scriberIdCommGroupService.findPage(new Page<ScriberIdCommCfg>(request, response,"r"), entity); Page<ScriberIdCommCfg> page = scriberIdCommGroupService.findPage(new Page<ScriberIdCommCfg>(request, response,"r"), entity);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(9); List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("regionList", regionList); model.addAttribute("regionList", regionList);
@@ -65,8 +65,8 @@ public class ScriberIdCommGroupController extends BaseController{
public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes,
HttpServletRequest request, HttpServletResponse response){ HttpServletRequest request, HttpServletResponse response){
initFormCondition(model,cfg); initFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(9); /*List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);*/
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/scriberidCommGroupFormAdd"; return "/basics/scriberidCommGroupFormAdd";
@@ -96,7 +96,7 @@ public class ScriberIdCommGroupController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
cfg = scriberIdCommGroupService.get(Long.parseLong(ids)); cfg = scriberIdCommGroupService.get(Long.parseLong(ids));
initUpdateFormCondition(model,cfg); initUpdateFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(9); List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/scriberidCommGroupFormUpdate"; return "/basics/scriberidCommGroupFormUpdate";
@@ -198,6 +198,7 @@ public class ScriberIdCommGroupController extends BaseController{
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("scriberid_comm_cfg"); cfg.setTableName("scriberid_comm_cfg");
cfg.setRegionId(regionIds.get(index)); cfg.setRegionId(regionIds.get(index));
cfg.setGroupName(cfg.getGroupName().toUpperCase());
index++; index++;
} }

9
src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java
View File

@@ -52,7 +52,7 @@ public class UrlCommGroupController extends BaseController{
Page<UrlCommCfg> page = urlCommGroupService.findPage(new Page<UrlCommCfg>(request, response,"r"), entity); Page<UrlCommCfg> page = urlCommGroupService.findPage(new Page<UrlCommCfg>(request, response,"r"), entity);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(7); List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE);
model.addAttribute("page", page); model.addAttribute("page", page);
model.addAttribute("regionList", regionList); model.addAttribute("regionList", regionList);
@@ -65,8 +65,8 @@ public class UrlCommGroupController extends BaseController{
public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes,
HttpServletRequest request, HttpServletResponse response){ HttpServletRequest request, HttpServletResponse response){
initFormCondition(model,cfg); initFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7); /*List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);*/
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/urlCommGroupFormAdd"; return "/basics/urlCommGroupFormAdd";
@@ -96,7 +96,7 @@ public class UrlCommGroupController extends BaseController{
,RedirectAttributes redirectAttributes){ ,RedirectAttributes redirectAttributes){
cfg = urlCommGroupService.get(Long.parseLong(ids)); cfg = urlCommGroupService.get(Long.parseLong(ids));
initUpdateFormCondition(model,cfg); initUpdateFormCondition(model,cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7); List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE);
model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("policyGroupInfos", groupInfos);
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
return "/basics/urlCommGroupFormUpdate"; return "/basics/urlCommGroupFormUpdate";
@@ -198,6 +198,7 @@ public class UrlCommGroupController extends BaseController{
cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
cfg.setTableName("url_comm_cfg"); cfg.setTableName("url_comm_cfg");
cfg.setRegionId(regionIds.get(index)); cfg.setRegionId(regionIds.get(index));
cfg.setGroupName(cfg.getGroupName().toUpperCase());
index++; index++;
} }

2
src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
View File

@@ -201,7 +201,7 @@
AND is_valid = #{isValid,jdbcType=INTEGER} AND is_valid = #{isValid,jdbcType=INTEGER}
</if> </if>
<if test="isValid == null" > <if test="isValid == null" >
AND is_valid != -1 AND is_valid != 0
</if> </if>
</trim> </trim>
</select> </select>

60
src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
View File

@@ -69,6 +69,7 @@ public class CommonGroupManageService extends BaseService{
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(CommonGroupInfo entity) throws MaatConvertException{ public void saveOrUpdate(CommonGroupInfo entity) throws MaatConvertException{
entity.setIsValid(1); entity.setIsValid(1);
entity.setGroupName(entity.getGroupName().toUpperCase());
if(entity.getGroupId()==null){ // 新增 if(entity.getGroupId()==null){ // 新增
Date createTime=new Date(); Date createTime=new Date();
entity.setCreatorId(UserUtils.getUser().getId()); entity.setCreatorId(UserUtils.getUser().getId());
@@ -84,7 +85,7 @@ public class CommonGroupManageService extends BaseService{
} }
entity.setServiceGroupId(serviceGroupId); entity.setServiceGroupId(serviceGroupId);
commonGroupManageDao.insert(entity); commonGroupManageDao.insert(entity);
this.updatePolicyGroupDict(entity.getGroupType()+""); //this.updatePolicyGroupDict(entity.getGroupType()+"");
}else{ // 修改 }else{ // 修改
Date editTime=new Date(); Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId()); entity.setEditorId(UserUtils.getUser().getId());
@@ -139,21 +140,23 @@ public class CommonGroupManageService extends BaseService{
boolean update=false; boolean update=false;
Integer udFlag = 0; Integer udFlag = 0;
Integer size = 0; Integer size = 0;
if(groupType == 5) { // IP if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP
size = ipCommGroupCfgDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString()); size = ipCommGroupCfgDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
}else if(groupType == 7) { // URL }else if(groupType == Constants.URL_OBJ_GROUP_TYPE) { // URL
size = urlCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString()); size = urlCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
}else if(groupType == 8) { // Domain }else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain
size = domainCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString()); size = domainCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
}else if(groupType == 9) { // ScriberId }else if(groupType == Constants.SUBID_OBJ_GROUP_TYPE) { // ScriberId
size = scriberIdCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString()); size = scriberIdCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
} }
if(size > 0 && info.getUdFlag().equals(0)) { if(size > 0 && info.getUdFlag().equals(0)) {
update=true; update=true;
udFlag = 1; udFlag = 1;
info.setUdFlag(udFlag);
}else if(size == 0 /*&& !info.getUdFlag().equals(2)*/){ }else if(size == 0 /*&& !info.getUdFlag().equals(2)*/){
update=true; update=true;
info.setUdFlag(udFlag);
} }
if(update){ if(update){
commonGroupManageDao.updateGroupStatus(info.getServiceGroupId().toString(), udFlag, groupType); commonGroupManageDao.updateGroupStatus(info.getServiceGroupId().toString(), udFlag, groupType);
@@ -171,7 +174,7 @@ public class CommonGroupManageService extends BaseService{
* 更新字典缓存 * 更新字典缓存
* @return * @return
*/ */
private void updatePolicyGroupDict(String groupTypes) { /*private void updatePolicyGroupDict(String groupTypes) {
String dictKey = Constants.CACHE_IPGROUP_DICT; String dictKey = Constants.CACHE_IPGROUP_DICT;
if(groupTypes.contains(",")) { if(groupTypes.contains(",")) {
String[] split = groupTypes.split(","); String[] split = groupTypes.split(",");
@@ -204,7 +207,7 @@ public class CommonGroupManageService extends BaseService{
} }
} }*/
/** /**
* 校验执行删除操作后分组下域配置是否为空 * 校验执行删除操作后分组下域配置是否为空
@@ -237,13 +240,13 @@ public class CommonGroupManageService extends BaseService{
cfgIds += "," + cfgId; cfgIds += "," + cfgId;
} }
Integer size = 0; Integer size = 0;
if(groupType == 5) { // IP if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), IpCommCfg.getIndexTable()); size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), IpCommCfg.getIndexTable());
}else if(groupType == 7) { // URL }else if(groupType == Constants.URL_OBJ_GROUP_TYPE) { // URL
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), UrlCommCfg.getTablename()); size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), UrlCommCfg.getTablename());
}else if(groupType == 8) { // Domain }else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), DomainCommCfg.getTablename()); size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), DomainCommCfg.getTablename());
}else if(groupType == 9) { // ScriberId }else if(groupType == Constants.SUBID_OBJ_GROUP_TYPE) { // ScriberId
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), ScriberIdCommCfg.getTablename()); size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), ScriberIdCommCfg.getTablename());
} }
@@ -256,5 +259,38 @@ public class CommonGroupManageService extends BaseService{
} }
return resultList; return resultList;
} }
/**
* 分组域配置新增或修改时调用：获取service group id
* @param cfg
* @return
*/
public Integer getServiceGroupId(String groupName, Integer groupType) {
CommonGroupInfo entity = new CommonGroupInfo();
int serviceGroupId = 0;
entity.setGroupType(groupType);
entity.setGroupName(groupName);
CommonGroupInfo groupInfo = commonGroupManageDao.getGroupInfo(entity);
if(groupInfo == null) {
// 获取GroupId
List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
if(groupIds.size()>0) {
serviceGroupId =groupIds.get(0).intValue();
}else {
throw new MaatConvertException("Get group id failed");
}
entity.setServiceGroupId(serviceGroupId);
Date createTime=new Date();
entity.setIsValid(1);
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
commonGroupManageDao.insert(entity);
}else {
serviceGroupId = groupInfo.getServiceGroupId();
}
return serviceGroupId;
}
} }

80
src/main/java/com/nis/web/service/basics/DomainCommGroupService.java
View File

@@ -65,9 +65,14 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
public void saveCommGroupCfg(CfgIndexInfo entity) { public void saveCommGroupCfg(CfgIndexInfo entity) {
Date createTime=new Date(); Date createTime=new Date();
if(entity.getDomainCommGroupList()!=null) { if(entity.getDomainCommGroupList()!=null) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
for (int i = 0; i < entity.getDomainCommGroupList().size(); i++) { // 获取分组ID
BeanUtils.copyProperties(entity, entity.getDomainCommGroupList().get(i), new String[]{"cfgId"}); Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+"");
for (DomainCommCfg cfg : entity.getDomainCommGroupList()) {
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
Integer regionId = 0; Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1); List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){ if(regionIds!=null && regionIds.size()>0){
@@ -75,28 +80,28 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
}else { }else {
throw new MaatConvertException("Get region id failed"); throw new MaatConvertException("Get region id failed");
} }
entity.getDomainCommGroupList().get(i).setRegionId(regionId); cfg.setRegionId(regionId);
entity.getDomainCommGroupList().get(i).setRequestId(0);
entity.getDomainCommGroupList().get(i).setClassify("0"); cfg.setRequestId(0);
entity.getDomainCommGroupList().get(i).setAttribute("0"); cfg.setClassify("0");
entity.getDomainCommGroupList().get(i).setLable("0"); cfg.setAttribute("0");
entity.getDomainCommGroupList().get(i).setIsHexbin(2); cfg.setLable("0");
entity.getDomainCommGroupList().get(i).setCreateTime(createTime); cfg.setIsHexbin(2);
entity.getDomainCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId()); cfg.setCreateTime(createTime);
entity.getDomainCommGroupList().get(i).setIsValid(Constants.VALID_NO); cfg.setCreatorId(entity.getCurrentUser().getId());
entity.getDomainCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsValid(Constants.VALID_NO);
if(entity.getDomainCommGroupList().get(i).getCfgKeywords().contains("***and***")){ cfg.setIsAudit(Constants.AUDIT_NOT_YET);
entity.getDomainCommGroupList().get(i).setExprType(1); if(cfg.getCfgKeywords().contains("***and***")){
}else{ cfg.setExprType(1);
entity.getDomainCommGroupList().get(i).setExprType(0); }else{
} cfg.setExprType(0);
entity.getDomainCommGroupList().get(i).setGroupId(entity.getGroupId()); }
cfg.setGroupId(serviceGroupId);
domainCommGroupDao.insertCommGroupCfg(cfg);
domainCommGroupDao.insertCommGroupCfg(entity.getDomainCommGroupList().get(i));
} }
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 8); groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
} }
@@ -113,15 +118,20 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
}else{ }else{
entity.setExprType(0); entity.setExprType(0);
} }
// 获取分组ID
Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE);
entity.setGroupId(serviceGroupId);
domainCommGroupDao.update(entity); domainCommGroupDao.update(entity);
// 更新分组状态 // 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>(); List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改
groupManageService.updateGroupStatus(policyGroupInfos, 8); policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); // new
} }
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -131,7 +141,7 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
domainCommGroupDao.delete(ids); domainCommGroupDao.delete(ids);
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 8); groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -153,19 +163,23 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
String ids = ""; String ids = "";
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(BaseStringCfg<?> cfg:cfgs) { for(BaseStringCfg<?> cfg:cfgs) {
if(!ids.contains(cfg.getGroupId()+"")) { DomainCommCfg domainCommCfg=new DomainCommCfg();
ids += ","+cfg.getGroupId(); BeanUtils.copyProperties(cfg, domainCommCfg);
Integer serviceGroupId = groupManageService.getServiceGroupId(domainCommCfg.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE);
if(!ids.contains(serviceGroupId+"")) {
ids += ","+serviceGroupId;
} }
DomainCommCfg DomainCommCfg=new DomainCommCfg(); domainCommCfg.setGroupId(serviceGroupId);
BeanUtils.copyProperties(cfg, DomainCommCfg);
((DomainCommGroupDao) batchSqlSession.getMapper(DomainCommGroupDao.class)).insertCommGroupCfg(DomainCommCfg); ((DomainCommGroupDao) batchSqlSession.getMapper(DomainCommGroupDao.class)).insertCommGroupCfg(domainCommCfg);
} }
batchSqlSession.commit(); batchSqlSession.commit();
// 更新分组状态 // 更新分组状态
String serviceGroupIds = ids.substring(1); String serviceGroupIds = ids.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 8); groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){

62
src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
View File

@@ -73,14 +73,19 @@ public class IpCommGroupCfgService extends BaseService {
} }
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void update(IpCommCfg entity){ public void update(IpCommCfg entity){
// 获取分组ID
Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.IP_OBJ_GROUP_TYPE);
entity.setGroupId(serviceGroupId);
ipCommGroupCfgDao.update(entity); ipCommGroupCfgDao.update(entity);
// 更新分组状态 // 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>(); List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old
groupManageService.updateGroupStatus(policyGroupInfos, 5); if(!entity.getUserRegion1().equals(entity.getGroupId()+"")) { // 分组已修改
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId()+"")); // new
} }
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -95,12 +100,16 @@ public class IpCommGroupCfgService extends BaseService {
//新增 //新增
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveIpCommGroupCfg(CfgIndexInfo entity) { public void saveIpCommGroupCfg(CfgIndexInfo entity) {
Date createTime=new Date(); Date createTime=new Date();
if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) { if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) { // 获取分组ID
BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"}); Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.IP_OBJ_GROUP_TYPE);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+"");
for (IpCommCfg cfg : entity.getIpCommGroupCfgList()) {
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId","userregion3"});
Integer regionId = 0; Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1); List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){ if(regionIds!=null && regionIds.size()>0){
@@ -108,21 +117,22 @@ public class IpCommGroupCfgService extends BaseService {
}else { }else {
throw new MaatConvertException("Get region id failed"); throw new MaatConvertException("Get region id failed");
} }
entity.getIpCommGroupCfgList().get(i).setRegionId(regionId); cfg.setRegionId(regionId);
entity.getIpCommGroupCfgList().get(i).setRequestId(0);
entity.getIpCommGroupCfgList().get(i).setClassify("0"); cfg.setRequestId(0);
entity.getIpCommGroupCfgList().get(i).setAttribute("0"); cfg.setClassify("0");
entity.getIpCommGroupCfgList().get(i).setLable("0"); cfg.setAttribute("0");
entity.getIpCommGroupCfgList().get(i).setCreateTime(createTime); cfg.setLable("0");
entity.getIpCommGroupCfgList().get(i).setCreatorId(entity.getCurrentUser().getId()); cfg.setCreateTime(createTime);
entity.getIpCommGroupCfgList().get(i).setIsValid(Constants.VALID_NO); cfg.setCreatorId(entity.getCurrentUser().getId());
entity.getIpCommGroupCfgList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsValid(Constants.VALID_NO);
entity.getIpCommGroupCfgList().get(i).setGroupId(entity.getGroupId()); cfg.setIsAudit(Constants.AUDIT_NOT_YET);
ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i)); cfg.setGroupId(serviceGroupId);
ipCommGroupCfgDao.insertForBatch(cfg);
} }
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 5); groupManageService.updateGroupStatus(policyGroupInfos, 5);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -150,11 +160,15 @@ public class IpCommGroupCfgService extends BaseService {
String ids = ""; String ids = "";
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(BaseIpCfg cfg:cfgs) { for(BaseIpCfg cfg:cfgs) {
if(!ids.contains(cfg.getGroupId()+"")) {
ids += ","+cfg.getGroupId();
}
IpCommCfg ipCommCfg=new IpCommCfg(); IpCommCfg ipCommCfg=new IpCommCfg();
BeanUtils.copyProperties(cfg, ipCommCfg); BeanUtils.copyProperties(cfg, ipCommCfg);
Integer serviceGroupId = groupManageService.getServiceGroupId(ipCommCfg.getGroupName(), Constants.IP_OBJ_GROUP_TYPE);
if(!ids.contains(serviceGroupId+"")) {
ids += ","+serviceGroupId;
}
ipCommCfg.setGroupId(serviceGroupId);
((IpCommGroupCfgDao) batchSqlSession.getMapper(IpCommGroupCfgDao.class)).insertForBatch(ipCommCfg); ((IpCommGroupCfgDao) batchSqlSession.getMapper(IpCommGroupCfgDao.class)).insertForBatch(ipCommCfg);
} }
@@ -163,7 +177,7 @@ public class IpCommGroupCfgService extends BaseService {
// 更新分组状态 // 更新分组状态
String serviceGroupIds = ids.substring(1); String serviceGroupIds = ids.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 5); groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){

77
src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java
View File

@@ -65,9 +65,14 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
public void saveCommGroupCfg(CfgIndexInfo entity) { public void saveCommGroupCfg(CfgIndexInfo entity) {
Date createTime=new Date(); Date createTime=new Date();
if(entity.getScriberIdCommGroupList()!=null) { if(entity.getScriberIdCommGroupList()!=null) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
for (int i = 0; i < entity.getScriberIdCommGroupList().size(); i++) { // 获取分组ID
BeanUtils.copyProperties(entity, entity.getScriberIdCommGroupList().get(i), new String[]{"cfgId"}); Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.SUBID_OBJ_GROUP_TYPE);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+"");
for (ScriberIdCommCfg cfg : entity.getScriberIdCommGroupList()) {
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
Integer regionId = 0; Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1); List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){ if(regionIds!=null && regionIds.size()>0){
@@ -75,28 +80,27 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
}else { }else {
throw new MaatConvertException("Get region id failed"); throw new MaatConvertException("Get region id failed");
} }
entity.getScriberIdCommGroupList().get(i).setRegionId(regionId); cfg.setRegionId(regionId);
entity.getScriberIdCommGroupList().get(i).setRequestId(0);
entity.getScriberIdCommGroupList().get(i).setClassify("0");
entity.getScriberIdCommGroupList().get(i).setAttribute("0");
entity.getScriberIdCommGroupList().get(i).setLable("0");
entity.getScriberIdCommGroupList().get(i).setIsHexbin(2);
entity.getScriberIdCommGroupList().get(i).setCreateTime(createTime);
entity.getScriberIdCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId());
entity.getScriberIdCommGroupList().get(i).setIsValid(Constants.VALID_NO);
entity.getScriberIdCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
if(entity.getScriberIdCommGroupList().get(i).getCfgKeywords().contains("***and***")){
entity.getScriberIdCommGroupList().get(i).setExprType(1);
}else{
entity.getScriberIdCommGroupList().get(i).setExprType(0);
}
entity.getScriberIdCommGroupList().get(i).setGroupId(entity.getGroupId());
scriberIdCommGroupDao.insertCommGroupCfg(entity.getScriberIdCommGroupList().get(i)); cfg.setRequestId(0);
cfg.setClassify("0");
cfg.setAttribute("0");
cfg.setLable("0");
cfg.setIsHexbin(2);
cfg.setCreateTime(createTime);
cfg.setCreatorId(entity.getCurrentUser().getId());
cfg.setIsValid(Constants.VALID_NO);
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
if(cfg.getCfgKeywords().contains("***and***")){
cfg.setExprType(1);
}else{
cfg.setExprType(0);
}
cfg.setGroupId(serviceGroupId);
scriberIdCommGroupDao.insertCommGroupCfg(cfg);
} }
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 9); groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -114,15 +118,20 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
}else{ }else{
entity.setExprType(0); entity.setExprType(0);
} }
// 获取分组ID
Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.SUBID_OBJ_GROUP_TYPE);
entity.setGroupId(serviceGroupId);
scriberIdCommGroupDao.update(entity); scriberIdCommGroupDao.update(entity);
// 更新分组状态 // 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>(); List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old
groupManageService.updateGroupStatus(policyGroupInfos, 9); if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); // new
} }
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -132,7 +141,7 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
scriberIdCommGroupDao.delete(ids); scriberIdCommGroupDao.delete(ids);
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 9); groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -154,11 +163,15 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
String ids = ""; String ids = "";
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(BaseStringCfg<?> cfg:cfgs) { for(BaseStringCfg<?> cfg:cfgs) {
if(!ids.contains(cfg.getGroupId()+"")) {
ids += ","+cfg.getGroupId();
}
ScriberIdCommCfg commCfg=new ScriberIdCommCfg(); ScriberIdCommCfg commCfg=new ScriberIdCommCfg();
BeanUtils.copyProperties(cfg, commCfg); BeanUtils.copyProperties(cfg, commCfg);
Integer serviceGroupId = groupManageService.getServiceGroupId(commCfg.getGroupName(), Constants.SUBID_OBJ_GROUP_TYPE);
if(!ids.contains(serviceGroupId+"")) {
ids += ","+serviceGroupId;
}
commCfg.setGroupId(serviceGroupId);
((ScriberIdCommGroupDao) batchSqlSession.getMapper(ScriberIdCommGroupDao.class)).insertCommGroupCfg(commCfg); ((ScriberIdCommGroupDao) batchSqlSession.getMapper(ScriberIdCommGroupDao.class)).insertCommGroupCfg(commCfg);
} }
batchSqlSession.commit(); batchSqlSession.commit();
@@ -166,7 +179,7 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
// 更新分组状态 // 更新分组状态
String serviceGroupIds = ids.substring(1); String serviceGroupIds = ids.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 9); groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){

77
src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
View File

@@ -64,9 +64,14 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
public void saveUrlCommGroupCfg(CfgIndexInfo entity) { public void saveUrlCommGroupCfg(CfgIndexInfo entity) {
Date createTime=new Date(); Date createTime=new Date();
if(entity.getUrlCommGroupList()!=null) { if(entity.getUrlCommGroupList()!=null) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) { // 获取分组ID
BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"}); Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.URL_OBJ_GROUP_TYPE);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+"");
for (UrlCommCfg cfg : entity.getUrlCommGroupList()) {
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
Integer regionId = 0; Integer regionId = 0;
List<Integer> regionIds = ConfigServiceUtil.getId(3, 1); List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
if(regionIds!=null && regionIds.size()>0){ if(regionIds!=null && regionIds.size()>0){
@@ -74,27 +79,28 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
}else { }else {
throw new MaatConvertException("Get region id failed"); throw new MaatConvertException("Get region id failed");
} }
entity.getUrlCommGroupList().get(i).setRegionId(regionId); cfg.setRegionId(regionId);
entity.getUrlCommGroupList().get(i).setRequestId(0);
entity.getUrlCommGroupList().get(i).setClassify("0"); cfg.setRequestId(0);
entity.getUrlCommGroupList().get(i).setAttribute("0"); cfg.setClassify("0");
entity.getUrlCommGroupList().get(i).setLable("0"); cfg.setAttribute("0");
entity.getUrlCommGroupList().get(i).setIsHexbin(0); cfg.setLable("0");
entity.getUrlCommGroupList().get(i).setCreateTime(createTime); cfg.setIsHexbin(0);
entity.getUrlCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId()); cfg.setCreateTime(createTime);
entity.getUrlCommGroupList().get(i).setIsValid(Constants.VALID_NO); cfg.setCreatorId(entity.getCurrentUser().getId());
entity.getUrlCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); cfg.setIsValid(Constants.VALID_NO);
if(entity.getUrlCommGroupList().get(i).getCfgKeywords().contains("***and***")){ cfg.setIsAudit(Constants.AUDIT_NOT_YET);
entity.getUrlCommGroupList().get(i).setExprType(1); if(cfg.getCfgKeywords().contains("***and***")){
}else{ cfg.setExprType(1);
entity.getUrlCommGroupList().get(i).setExprType(0); }else{
} cfg.setExprType(0);
entity.getUrlCommGroupList().get(i).setGroupId(entity.getGroupId()); }
cfg.setGroupId(serviceGroupId);
urlCommGroupDao.insertUrlCommGroupCfg(cfg);
urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
} }
// 更新分组状态 // 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 7); groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
} }
@@ -111,15 +117,20 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
}else{ }else{
entity.setExprType(0); entity.setExprType(0);
} }
// 获取分组ID
Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.URL_OBJ_GROUP_TYPE);
entity.setGroupId(serviceGroupId);
urlCommGroupDao.update(entity); urlCommGroupDao.update(entity);
// 更新分组状态 // 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>(); List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old
groupManageService.updateGroupStatus(policyGroupInfos, 7); if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); // new
} }
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -129,7 +140,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
urlCommGroupDao.delete(ids); urlCommGroupDao.delete(ids);
// 更新分组状态 // 更新分组状态
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 7); groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos); transObjGroupToMaat(policyGroupInfos);
} }
@@ -151,11 +162,15 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
String ids = ""; String ids = "";
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
for(BaseStringCfg<?> cfg:cfgs) { for(BaseStringCfg<?> cfg:cfgs) {
if(!ids.contains(cfg.getGroupId()+"")) {
ids += ","+cfg.getGroupId();
}
UrlCommCfg urlCommCfg=new UrlCommCfg(); UrlCommCfg urlCommCfg=new UrlCommCfg();
BeanUtils.copyProperties(cfg, urlCommCfg); BeanUtils.copyProperties(cfg, urlCommCfg);
Integer serviceGroupId = groupManageService.getServiceGroupId(urlCommCfg.getGroupName(), Constants.URL_OBJ_GROUP_TYPE);
if(!ids.contains(serviceGroupId+"")) {
ids += ","+serviceGroupId;
}
urlCommCfg.setGroupId(serviceGroupId);
((UrlCommGroupDao) batchSqlSession.getMapper(UrlCommGroupDao.class)).insertUrlCommGroupCfg(urlCommCfg); ((UrlCommGroupDao) batchSqlSession.getMapper(UrlCommGroupDao.class)).insertUrlCommGroupCfg(urlCommCfg);
} }
batchSqlSession.commit(); batchSqlSession.commit();
@@ -163,7 +178,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
// 更新分组状态 // 更新分组状态
String serviceGroupIds = ids.substring(1); String serviceGroupIds = ids.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 7); groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
}finally { }finally {
if(batchSqlSession != null){ if(batchSqlSession != null){

9
src/main/resources/sql/20190610/common_group_save_cfg.sql
View File

@@ -24,6 +24,15 @@ INSERT INTO `sys_data_dictionary_item` (
`dictionary_id` `dictionary_id`
) )
VALUES VALUES
(
'5',
'IP GROUP',
'普通IP组',
'0',
'1',
'1',
(SELECT id FROM sys_data_dictionary_name WHERE mark = 'GROUP_TYPE')
),
( (
'7', '7',
'URL GROUP', 'URL GROUP',

3
src/main/webapp/WEB-INF/include/header.jsp
View File

@@ -38,6 +38,8 @@
<!-- 日志界面 --> <!-- 日志界面 -->
<link href="${pageContext.request.contextPath}/static/pages/css/pageLogs.css" rel="stylesheet" type="text/css" /> <link href="${pageContext.request.contextPath}/static/pages/css/pageLogs.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/jquery-ui/jquery-ui.min.css" rel="stylesheet" type="text/css" />
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/excanvas.min.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/excanvas.min.js"></script>
@@ -110,3 +112,4 @@
<script src="${pageContext.request.contextPath}/static/pages/scripts/appNames.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/pages/scripts/appNames.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/clipboard.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/clipboard.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>

40
src/main/webapp/WEB-INF/views/basics/domainCommGroupFormAdd.jsp
View File

@@ -40,7 +40,31 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
// 获取所有分组可选项
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=8',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
//业务窗口打开 //业务窗口打开
var addContent = function(obj, contentClassName) { var addContent = function(obj, contentClassName) {
@@ -169,16 +193,12 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6 has-feedback">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
<option value=""><spring:message code="select"/></option> <input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
<c:forEach items="${policyGroupInfos}" var="groupInfo">
<option value="${groupInfo.serviceGroupId}">${groupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

46
src/main/webapp/WEB-INF/views/basics/domainCommGroupFormUpdate.jsp
View File

@@ -37,7 +37,30 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=8',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
</script> </script>
</head> </head>
@@ -105,20 +128,17 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<option value=""><spring:message code="select"/></option> <c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
<c:forEach items="${policyGroupInfos}" var="groupInfo"> <c:set var="cfgGroupName" value="${ipGroupInfo.groupName }"></c:set>
<option value="${groupInfo.serviceGroupId}" </c:if>
<c:if test="${_cfg.groupId eq groupInfo.serviceGroupId }"> </c:forEach>
selected <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
</c:if> <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
>${groupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

42
src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
View File

@@ -6,8 +6,6 @@
<script type="text/javascript"> <script type="text/javascript">
var defaultIpInfo; var defaultIpInfo;
$(function(){ $(function(){
//$("select[name$='protocol']").parents(".form-group").addClass("hidden");
// $("select[name$='direction']").parents(".form-group").addClass("hidden");
defaultIpInfo=$(".ipInfo").clone(); defaultIpInfo=$(".ipInfo").clone();
$(".ipAdd").click(); $(".ipAdd").click();
$("#cfgFrom").validate({ $("#cfgFrom").validate({
@@ -20,6 +18,31 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
// 获取所有分组可选项
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=5',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
//业务窗口打开 //业务窗口打开
var addContent = function(obj, contentClassName) { var addContent = function(obj, contentClassName) {
@@ -73,6 +96,7 @@
} }
}) })
} }
</script> </script>
</head> </head>
<body> <body>
@@ -136,16 +160,12 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6 has-feedback">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
<option value=""><spring:message code="select"/></option> <input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
<c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<option value="${ipGroupInfo.serviceGroupId}">${ipGroupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

45
src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
View File

@@ -15,6 +15,29 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=5',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
</script> </script>
</head> </head>
@@ -89,21 +112,17 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%> <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
<option value="${_cfg.groupId}"><spring:message code="select"/></option> <c:set var="cfgGroupName" value="${ipGroupInfo.groupName }"></c:set>
<c:forEach items="${policyGroupInfos}" var="ipGroupInfo"> </c:if>
<option value="${ipGroupInfo.serviceGroupId}" </c:forEach>
<c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }"> <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
selected <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
</c:if>
>${ipGroupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
<div class="col-md-6 hidden"> <div class="col-md-6 hidden">

40
src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormAdd.jsp
View File

@@ -40,7 +40,31 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
// 获取所有分组可选项
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=9',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
//业务窗口打开 //业务窗口打开
var addContent = function(obj, contentClassName) { var addContent = function(obj, contentClassName) {
@@ -158,16 +182,12 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6 has-feedback">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
<option value=""><spring:message code="select"/></option> <input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
<c:forEach items="${policyGroupInfos}" var="groupInfo">
<option value="${groupInfo.serviceGroupId}">${groupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

46
src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormUpdate.jsp
View File

@@ -37,7 +37,30 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=9',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
</script> </script>
</head> </head>
@@ -105,20 +128,17 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<option value=""><spring:message code="select"/></option> <c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
<c:forEach items="${policyGroupInfos}" var="groupInfo"> <c:set var="cfgGroupName" value="${ipGroupInfo.groupName }"></c:set>
<option value="${groupInfo.serviceGroupId}" </c:if>
<c:if test="${_cfg.groupId eq groupInfo.serviceGroupId }"> </c:forEach>
selected <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
</c:if> <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
>${groupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

39
src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
View File

@@ -40,7 +40,30 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
// 获取所有分组可选项
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=7',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
//业务窗口打开 //业务窗口打开
@@ -235,16 +258,12 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6 has-feedback">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
<option value=""><spring:message code="select"/></option> <input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
<option value="${urlGroupInfo.serviceGroupId}">${urlGroupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

47
src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
View File

@@ -49,7 +49,30 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
}); });
var availableTags = [];
var pathName = window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/basics/commonGroup/ajaxGetGroupInfoByType?groupType=7',
dataType:"json",
success:function(data){
if(data != null){
for(var i in data){
availableTags.push(data[i].groupName);
}
}
}
});
$("#srearchInput").autocomplete({
source: availableTags
});
window.onresize = function(){
$("#ui-id-1").hide();
};
}); });
</script> </script>
</head> </head>
@@ -119,21 +142,17 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label> <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<div class="col-md-6"> <div class="col-md-6">
<%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%> <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
<select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required"> <c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
<option value=""><spring:message code="select"/></option> <c:set var="cfgGroupName" value="${ipGroupInfo.groupName }"></c:set>
<c:forEach items="${policyGroupInfos}" var="groupInfo"> </c:if>
<option value="${groupInfo.serviceGroupId}" </c:forEach>
<c:if test="${_cfg.groupId eq groupInfo.serviceGroupId }"> <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
selected <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
</c:if>
>${groupInfo.groupName}</option>
</c:forEach>
</select>
</div> </div>
<div for="groupId"></div> <div for="groupName"></div>
</div> </div>
</div> </div>
</div> </div>

12
src/main/webapp/static/global/css/page.css
View File

@@ -91,11 +91,19 @@ margin-top: 20px;
white-space: normal; white-space: normal;
} }
/* <20><><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3>,<2C><>ӡ<EFBFBD><D3A1>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʾ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */ /* <20><><EFBFBD><EFBFBD>ʵʱ<CAB5><CAB1><EFBFBD><EFBFBD>ģ<EFBFBD><C4A3>,<2C><>ӡ<EFBFBD><D3A1>ť<EFBFBD><C5A5><EFBFBD><EFBFBD>ʾ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
.css-print{ .css-print{
display: none; display: none;
} }
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӵ<EFBFBD> */ /* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӵ<EFBFBD> */
.print-title{ .print-title{
font-weight:bold; font-weight:bold;
}
/* 分组配置管理模块 */
.ui-autocomplete {
max-height: 180px;
overflow-y: auto;
/* 防止水平滚动条 */
overflow-x: hidden;
} }

1812
src/main/webapp/static/global/plugins/jquery-ui/jquery-ui.min.css vendored
View File

File diff suppressed because one or more lines are too long