From d245ef7dc4586cd41d020cf1da36e4ea42b00c9e Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 14 Jun 2019 17:12:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E9=85=8D=E7=BD=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86GroupName=E6=94=B9=E4=B8=BA=E5=8F=AF=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/BaseStringCfg.java | 7 + .../domain/configuration/CfgIndexInfo.java | 7 + .../template/DomainCommCfgTemplate.java | 12 +- .../template/IpCommCfgTemplate.java | 45 +- .../template/ScriberIdCommCfgTemplate.java | 12 +- .../template/UrlCommCfgTemplate.java | 12 +- src/main/java/com/nis/util/DictUtils.java | 4 +- .../java/com/nis/util/excel/ExportExcel.java | 10 +- .../excel/thread/CheckIpFormatThread.java | 15 +- .../excel/thread/CheckStringFormatThread.java | 35 - .../basics/CommonGroupManageController.java | 6 + .../basics/DomainCommGroupController.java | 9 +- .../basics/IpCommGroupController.java | 10 +- .../basics/ScriberIdCommGroupController.java | 9 +- .../basics/UrlCommGroupController.java | 9 +- .../web/dao/basics/CommonGroupManageDao.xml | 2 +- .../basics/CommonGroupManageService.java | 60 +- .../basics/DomainCommGroupService.java | 80 +- .../service/basics/IpCommGroupCfgService.java | 62 +- .../basics/ScriberIdCommGroupService.java | 77 +- .../service/basics/UrlCommGroupService.java | 77 +- .../sql/20190610/common_group_save_cfg.sql | 9 + src/main/webapp/WEB-INF/include/header.jsp | 3 + .../views/basics/domainCommGroupFormAdd.jsp | 40 +- .../basics/domainCommGroupFormUpdate.jsp | 46 +- .../views/basics/ipCommGroupFormAdd.jsp | 42 +- .../views/basics/ipCommGroupFormUpdate.jsp | 45 +- .../basics/scriberidCommGroupFormAdd.jsp | 40 +- .../basics/scriberidCommGroupFormUpdate.jsp | 46 +- .../views/basics/urlCommGroupFormAdd.jsp | 39 +- .../views/basics/urlCommGroupFormUpdate.jsp | 47 +- src/main/webapp/static/global/css/page.css | 12 +- .../plugins/jquery-ui/jquery-ui.min.css | 1812 ++++++++++++++++- 33 files changed, 2384 insertions(+), 357 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index e574328d5..67afb4c40 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -45,7 +45,14 @@ public class BaseStringCfg extends BaseCfg { protected Integer specServiceId;//仅用于copy属性使用 protected String domain;//仅用于copy属性使用 protected Integer dnsStrategyId;//仅用作复制属性使用 + protected String groupName; + public String getGroupName() { + return groupName; + } + public void setGroupName(String groupName) { + this.groupName = groupName; + } public Integer getDnsStrategyId() { return dnsStrategyId; } diff --git a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java index a90d4b88f..2fe73d113 100644 --- a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java +++ b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java @@ -96,6 +96,7 @@ public class CfgIndexInfo extends BaseCfg { private List ipCommGroupCfgList; private List domainCommGroupList; private List scriberIdCommGroupList; + private String groupName; /*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数 @@ -108,6 +109,12 @@ public class CfgIndexInfo extends BaseCfg { public String getOrganization() { return organization; } + public String getGroupName() { + return groupName; + } + public void setGroupName(String groupName) { + this.groupName = groupName; + } public List getIpCommGroupCfgList() { return ipCommGroupCfgList; } diff --git a/src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java index 5a547f7b5..3cb5f32ce 100644 --- a/src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/DomainCommCfgTemplate.java @@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField; public class DomainCommCfgTemplate extends StringAllNotDoLogTemplate{ @ExcelField(title="group_name",align=2,sort=10) - private Integer groupId; + private String groupName; - public Integer getGroupId() { - return groupId; + public String getGroupName() { + return groupName; } - public void setGroupId(Integer groupId) { - this.groupId = groupId; + public void setGroupName(String groupName) { + this.groupName = groupName; } - + } diff --git a/src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java index 72a9c327e..c49a0ad96 100644 --- a/src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/IpCommCfgTemplate.java @@ -3,45 +3,18 @@ package com.nis.domain.configuration.template; import com.nis.util.excel.ExcelField; public class IpCommCfgTemplate extends IpAllNotDoLogTemplate{ + @ExcelField(title="group_name",align=2,sort=10) - private Integer groupId; + private String groupName; - public Integer getGroupId() { - return groupId; - } + public String getGroupName() { + return groupName; + } - public void setGroupId(Integer groupId) { - this.groupId = groupId; - } + public void setGroupName(String groupName) { + 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(); - }*/ + } \ No newline at end of file diff --git a/src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java index d48298ae2..73da624be 100644 --- a/src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/ScriberIdCommCfgTemplate.java @@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField; public class ScriberIdCommCfgTemplate extends StringAllNotDoLogTemplate{ @ExcelField(title="group_name",align=2,sort=10) - private Integer groupId; + private String groupName; - public Integer getGroupId() { - return groupId; + public String getGroupName() { + return groupName; } - public void setGroupId(Integer groupId) { - this.groupId = groupId; + public void setGroupName(String groupName) { + this.groupName = groupName; } - + } diff --git a/src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java index 753516f61..e32ae3832 100644 --- a/src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java +++ b/src/main/java/com/nis/domain/configuration/template/UrlCommCfgTemplate.java @@ -10,14 +10,14 @@ import com.nis.util.excel.ExcelField; public class UrlCommCfgTemplate extends StringAllNotDoLogTemplate{ @ExcelField(title="group_name",align=2,sort=10) - private Integer groupId; + private String groupName; - public Integer getGroupId() { - return groupId; + public String getGroupName() { + return groupName; } - public void setGroupId(Integer groupId) { - this.groupId = groupId; + public void setGroupName(String groupName) { + this.groupName = groupName; } - + } diff --git a/src/main/java/com/nis/util/DictUtils.java b/src/main/java/com/nis/util/DictUtils.java index 7e96246e2..ea6765544 100644 --- a/src/main/java/com/nis/util/DictUtils.java +++ b/src/main/java/com/nis/util/DictUtils.java @@ -408,7 +408,7 @@ public class DictUtils { /** * 获取公共组字典缓存 */ - public static List getCommonGroups(Integer groupType){ + /*public static List getCommonGroups(Integer groupType){ String dictKey = Constants.CACHE_IPGROUP_DICT; if(groupType.equals(7)) { dictKey = Constants.CACHE_URLGROUP_DICT; @@ -436,6 +436,6 @@ public class DictUtils { } } return null; - } + }*/ } diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 60da0a052..58f311adf 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -470,17 +470,17 @@ public class ExportExcel { commentStr=""; List list = null; if(region.getFunctionId().equals(605)) { - list=policyGroupInfoDao.findPolicyGroupInfosByType(5); + list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE); }else if(region.getFunctionId().equals(606)) { - list=policyGroupInfoDao.findPolicyGroupInfosByType(7); + list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE); }else if(region.getFunctionId().equals(607)) { - list=policyGroupInfoDao.findPolicyGroupInfosByType(8); + list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE); }else if(region.getFunctionId().equals(608)) { - list=policyGroupInfoDao.findPolicyGroupInfosByType(9); + list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE); } if(!StringUtil.isEmpty(list)){ for (PolicyGroupInfo policyGroupInfo : list) { - commentStr=commentStr+policyGroupInfo.getServiceGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n"; + commentStr=commentStr+policyGroupInfo.getGroupName()+"\n"; index++; } } diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index 56457b8e4..5007beb8f 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -835,20 +835,7 @@ public class CheckIpFormatThread implements Callable{ } } } - - // 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)) { boolean srcIpEmpty = false; boolean destIpEmpty = false; diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index 0a780d6d0..599cb2014 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -132,41 +132,6 @@ public class CheckStringFormatThread implements Callable{ } // doLog属性检验 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.getFunctionId().equals(510) && "p2p_hash".equals(regionDict.getConfigServiceType())) { diff --git a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java index 1f68b71dc..ebaa86698 100644 --- a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java +++ b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java @@ -90,6 +90,12 @@ public class CommonGroupManageController extends BaseController { return commonGroupManageService.ajaxCheckIsLastOneCfg(grouIdAndCfgId, groupType); } + @ResponseBody + @RequestMapping(value="ajaxGetGroupInfoByType",method=RequestMethod.GET) + public List ajaxGetGroupInfoByType(Integer groupType){ + return commonGroupManageService.findCommonGroupInfosByType(groupType); + } + // 数据导出 @RequestMapping(value = "exportGroup") public void exportGroup(Model model,@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes, diff --git a/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java b/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java index 7d13392ce..cf005742a 100644 --- a/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/DomainCommGroupController.java @@ -52,7 +52,7 @@ public class DomainCommGroupController extends BaseController{ Page page = domainCommGroupService.findPage(new Page(request, response,"r"), entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); - List groupInfos = commonGroupManageService.findCommonGroupInfosByType(8); + List groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE); model.addAttribute("page", page); model.addAttribute("regionList", regionList); @@ -65,8 +65,8 @@ public class DomainCommGroupController extends BaseController{ public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response){ initFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(8); - model.addAttribute("policyGroupInfos", groupInfos); + /* List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE); + model.addAttribute("policyGroupInfos", groupInfos);*/ model.addAttribute("_cfg", cfg); return "/basics/domainCommGroupFormAdd"; @@ -96,7 +96,7 @@ public class DomainCommGroupController extends BaseController{ ,RedirectAttributes redirectAttributes){ cfg = domainCommGroupService.get(Long.parseLong(ids)); initUpdateFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(8); + List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE); model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("_cfg", cfg); return "/basics/domainCommGroupFormUpdate"; @@ -198,6 +198,7 @@ public class DomainCommGroupController extends BaseController{ cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setTableName("domain_comm_cfg"); cfg.setRegionId(regionIds.get(index)); + cfg.setGroupName(cfg.getGroupName().toUpperCase()); index++; } diff --git a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java index ca22410df..594447f19 100644 --- a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java @@ -30,7 +30,6 @@ import com.nis.domain.basics.CommonGroupInfo; import com.nis.domain.basics.IpCommCfg; import com.nis.domain.configuration.BaseIpCfg; 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; @@ -54,7 +53,7 @@ public class IpCommGroupController extends BaseController { Page page = ipCommGroupCfgService.findPage(new Page(request, response, "r"),entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); - List policyGroupInfos=commonGroupManageService.findCommonGroupInfosByType(5); + List policyGroupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE); model.addAttribute("page", page); model.addAttribute("regionList", regionList); @@ -70,8 +69,8 @@ public class IpCommGroupController extends BaseController { cfg.setGroupType(5); initFormCondition(model, cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(5); - model.addAttribute("policyGroupInfos", groupInfos); + /*List groupInfos=commonGroupManageService.findCommonGroupInfosByType(5); + model.addAttribute("policyGroupInfos", groupInfos);*/ model.addAttribute("_cfg", cfg); return "/basics/ipCommGroupFormAdd"; } @@ -102,7 +101,7 @@ public class IpCommGroupController extends BaseController { cfg.setGroupType(5); initUpdateFormCondition(model, cfg); - List groupInfos = commonGroupManageService.findCommonGroupInfosByType(5); + List groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE); model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("_cfg", cfg); return "/basics/ipCommGroupFormUpdate"; @@ -274,6 +273,7 @@ public class IpCommGroupController extends BaseController { cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setTableName("ip_comm_cfg"); cfg.setRegionId(regionIds.get(index)); + cfg.setGroupName(cfg.getGroupName().toUpperCase()); index++; } diff --git a/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java b/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java index d62a966dd..a61a695c8 100644 --- a/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/ScriberIdCommGroupController.java @@ -52,7 +52,7 @@ public class ScriberIdCommGroupController extends BaseController{ Page page = scriberIdCommGroupService.findPage(new Page(request, response,"r"), entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); - List groupInfos = commonGroupManageService.findCommonGroupInfosByType(9); + List groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE); model.addAttribute("page", page); model.addAttribute("regionList", regionList); @@ -65,8 +65,8 @@ public class ScriberIdCommGroupController extends BaseController{ public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response){ initFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(9); - model.addAttribute("policyGroupInfos", groupInfos); + /*List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE); + model.addAttribute("policyGroupInfos", groupInfos);*/ model.addAttribute("_cfg", cfg); return "/basics/scriberidCommGroupFormAdd"; @@ -96,7 +96,7 @@ public class ScriberIdCommGroupController extends BaseController{ ,RedirectAttributes redirectAttributes){ cfg = scriberIdCommGroupService.get(Long.parseLong(ids)); initUpdateFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(9); + List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE); model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("_cfg", cfg); return "/basics/scriberidCommGroupFormUpdate"; @@ -198,6 +198,7 @@ public class ScriberIdCommGroupController extends BaseController{ cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setTableName("scriberid_comm_cfg"); cfg.setRegionId(regionIds.get(index)); + cfg.setGroupName(cfg.getGroupName().toUpperCase()); index++; } diff --git a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java index 2b671f7df..838ca658a 100644 --- a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java @@ -52,7 +52,7 @@ public class UrlCommGroupController extends BaseController{ Page page = urlCommGroupService.findPage(new Page(request, response,"r"), entity); List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); List serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId()); - List groupInfos = commonGroupManageService.findCommonGroupInfosByType(7); + List groupInfos = commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE); model.addAttribute("page", page); model.addAttribute("regionList", regionList); @@ -65,8 +65,8 @@ public class UrlCommGroupController extends BaseController{ public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes, HttpServletRequest request, HttpServletResponse response){ initFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(7); - model.addAttribute("policyGroupInfos", groupInfos); + /*List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE); + model.addAttribute("policyGroupInfos", groupInfos);*/ model.addAttribute("_cfg", cfg); return "/basics/urlCommGroupFormAdd"; @@ -96,7 +96,7 @@ public class UrlCommGroupController extends BaseController{ ,RedirectAttributes redirectAttributes){ cfg = urlCommGroupService.get(Long.parseLong(ids)); initUpdateFormCondition(model,cfg); - List groupInfos=commonGroupManageService.findCommonGroupInfosByType(7); + List groupInfos=commonGroupManageService.findCommonGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE); model.addAttribute("policyGroupInfos", groupInfos); model.addAttribute("_cfg", cfg); return "/basics/urlCommGroupFormUpdate"; @@ -198,6 +198,7 @@ public class UrlCommGroupController extends BaseController{ cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId()); cfg.setTableName("url_comm_cfg"); cfg.setRegionId(regionIds.get(index)); + cfg.setGroupName(cfg.getGroupName().toUpperCase()); index++; } diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml index 83aab12d6..29c37a7ab 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml @@ -201,7 +201,7 @@ AND is_valid = #{isValid,jdbcType=INTEGER} - AND is_valid != -1 + AND is_valid != 0 diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java index 0bab619f7..cf3b7640c 100644 --- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java +++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java @@ -69,6 +69,7 @@ public class CommonGroupManageService extends BaseService{ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(CommonGroupInfo entity) throws MaatConvertException{ entity.setIsValid(1); + entity.setGroupName(entity.getGroupName().toUpperCase()); if(entity.getGroupId()==null){ // 新增 Date createTime=new Date(); entity.setCreatorId(UserUtils.getUser().getId()); @@ -84,7 +85,7 @@ public class CommonGroupManageService extends BaseService{ } entity.setServiceGroupId(serviceGroupId); commonGroupManageDao.insert(entity); - this.updatePolicyGroupDict(entity.getGroupType()+""); + //this.updatePolicyGroupDict(entity.getGroupType()+""); }else{ // 修改 Date editTime=new Date(); entity.setEditorId(UserUtils.getUser().getId()); @@ -139,21 +140,23 @@ public class CommonGroupManageService extends BaseService{ boolean update=false; Integer udFlag = 0; Integer size = 0; - if(groupType == 5) { // IP + if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP 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()); - }else if(groupType == 8) { // Domain + }else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain 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()); } if(size > 0 && info.getUdFlag().equals(0)) { update=true; udFlag = 1; + info.setUdFlag(udFlag); }else if(size == 0 /*&& !info.getUdFlag().equals(2)*/){ update=true; + info.setUdFlag(udFlag); } if(update){ commonGroupManageDao.updateGroupStatus(info.getServiceGroupId().toString(), udFlag, groupType); @@ -171,7 +174,7 @@ public class CommonGroupManageService extends BaseService{ * 更新字典缓存 * @return */ - private void updatePolicyGroupDict(String groupTypes) { + /*private void updatePolicyGroupDict(String groupTypes) { String dictKey = Constants.CACHE_IPGROUP_DICT; if(groupTypes.contains(",")) { String[] split = groupTypes.split(","); @@ -204,7 +207,7 @@ public class CommonGroupManageService extends BaseService{ } - } + }*/ /** * 校验执行删除操作后分组下域配置是否为空 @@ -237,13 +240,13 @@ public class CommonGroupManageService extends BaseService{ cfgIds += "," + cfgId; } Integer size = 0; - if(groupType == 5) { // IP + if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP 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()); - }else if(groupType == 8) { // Domain + }else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain 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()); } @@ -256,5 +259,38 @@ public class CommonGroupManageService extends BaseService{ } 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 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; + + } } diff --git a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java index ba5c58a8f..1a06d66e0 100644 --- a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java @@ -65,9 +65,14 @@ public class DomainCommGroupService extends CrudService, public void saveCommGroupCfg(CfgIndexInfo entity) { Date createTime=new Date(); if(entity.getDomainCommGroupList()!=null) { - List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()); - for (int i = 0; i < entity.getDomainCommGroupList().size(); i++) { - BeanUtils.copyProperties(entity, entity.getDomainCommGroupList().get(i), new String[]{"cfgId"}); + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE); + List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+""); + + for (DomainCommCfg cfg : entity.getDomainCommGroupList()) { + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + Integer regionId = 0; List regionIds = ConfigServiceUtil.getId(3, 1); if(regionIds!=null && regionIds.size()>0){ @@ -75,28 +80,28 @@ public class DomainCommGroupService extends CrudService, }else { throw new MaatConvertException("Get region id failed"); } - entity.getDomainCommGroupList().get(i).setRegionId(regionId); - entity.getDomainCommGroupList().get(i).setRequestId(0); - entity.getDomainCommGroupList().get(i).setClassify("0"); - entity.getDomainCommGroupList().get(i).setAttribute("0"); - entity.getDomainCommGroupList().get(i).setLable("0"); - entity.getDomainCommGroupList().get(i).setIsHexbin(2); - entity.getDomainCommGroupList().get(i).setCreateTime(createTime); - entity.getDomainCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId()); - entity.getDomainCommGroupList().get(i).setIsValid(Constants.VALID_NO); - entity.getDomainCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); - if(entity.getDomainCommGroupList().get(i).getCfgKeywords().contains("***and***")){ - entity.getDomainCommGroupList().get(i).setExprType(1); - }else{ - entity.getDomainCommGroupList().get(i).setExprType(0); - } - entity.getDomainCommGroupList().get(i).setGroupId(entity.getGroupId()); + cfg.setRegionId(regionId); + + 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); + domainCommGroupDao.insertCommGroupCfg(cfg); - domainCommGroupDao.insertCommGroupCfg(entity.getDomainCommGroupList().get(i)); } // 更新分组状态 - groupManageService.updateGroupStatus(policyGroupInfos, 8); - //TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置 + groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE); transObjGroupToMaat(policyGroupInfos); } } @@ -113,15 +118,20 @@ public class DomainCommGroupService extends CrudService, }else{ entity.setExprType(0); } + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.DOMAIN_OBJ_GROUP_TYPE); + entity.setGroupId(serviceGroupId); domainCommGroupDao.update(entity); // 更新分组状态 List policyGroupInfos = new ArrayList(); - if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { - policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); - groupManageService.updateGroupStatus(policyGroupInfos, 8); + policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old + if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改 + 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); } @@ -131,7 +141,7 @@ public class DomainCommGroupService extends CrudService, List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); domainCommGroupDao.delete(ids); // 更新分组状态 - groupManageService.updateGroupStatus(policyGroupInfos, 8); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE); transObjGroupToMaat(policyGroupInfos); } @@ -153,19 +163,23 @@ public class DomainCommGroupService extends CrudService, String ids = ""; batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseStringCfg cfg:cfgs) { - if(!ids.contains(cfg.getGroupId()+"")) { - ids += ","+cfg.getGroupId(); + DomainCommCfg domainCommCfg=new DomainCommCfg(); + 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(); - BeanUtils.copyProperties(cfg, DomainCommCfg); - ((DomainCommGroupDao) batchSqlSession.getMapper(DomainCommGroupDao.class)).insertCommGroupCfg(DomainCommCfg); + domainCommCfg.setGroupId(serviceGroupId); + + ((DomainCommGroupDao) batchSqlSession.getMapper(DomainCommGroupDao.class)).insertCommGroupCfg(domainCommCfg); } batchSqlSession.commit(); // 更新分组状态 String serviceGroupIds = ids.substring(1); List policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); - groupManageService.updateGroupStatus(policyGroupInfos, 8); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE); }finally { if(batchSqlSession != null){ diff --git a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java index babd5f09f..5d11e27b2 100644 --- a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java +++ b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java @@ -73,14 +73,19 @@ public class IpCommGroupCfgService extends BaseService { } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void update(IpCommCfg entity){ + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.IP_OBJ_GROUP_TYPE); + entity.setGroupId(serviceGroupId); ipCommGroupCfgDao.update(entity); + // 更新分组状态 List policyGroupInfos = new ArrayList(); - if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { - groupManageService.updateGroupStatus(policyGroupInfos, 5); - policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); + policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old + if(!entity.getUserRegion1().equals(entity.getGroupId()+"")) { // 分组已修改 + policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId()+"")); // new } - policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString())); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE); + transObjGroupToMaat(policyGroupInfos); } @@ -95,12 +100,16 @@ public class IpCommGroupCfgService extends BaseService { //新增 @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveIpCommGroupCfg(CfgIndexInfo entity) { - Date createTime=new Date(); if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) { - List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()); - for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) { - BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"}); + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.IP_OBJ_GROUP_TYPE); + List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+""); + + for (IpCommCfg cfg : entity.getIpCommGroupCfgList()) { + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId","userregion3"}); + Integer regionId = 0; List regionIds = ConfigServiceUtil.getId(3, 1); if(regionIds!=null && regionIds.size()>0){ @@ -108,21 +117,22 @@ public class IpCommGroupCfgService extends BaseService { }else { throw new MaatConvertException("Get region id failed"); } - entity.getIpCommGroupCfgList().get(i).setRegionId(regionId); - entity.getIpCommGroupCfgList().get(i).setRequestId(0); - entity.getIpCommGroupCfgList().get(i).setClassify("0"); - entity.getIpCommGroupCfgList().get(i).setAttribute("0"); - entity.getIpCommGroupCfgList().get(i).setLable("0"); - entity.getIpCommGroupCfgList().get(i).setCreateTime(createTime); - entity.getIpCommGroupCfgList().get(i).setCreatorId(entity.getCurrentUser().getId()); - entity.getIpCommGroupCfgList().get(i).setIsValid(Constants.VALID_NO); - entity.getIpCommGroupCfgList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); - entity.getIpCommGroupCfgList().get(i).setGroupId(entity.getGroupId()); - ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i)); + cfg.setRegionId(regionId); + + cfg.setRequestId(0); + cfg.setClassify("0"); + cfg.setAttribute("0"); + cfg.setLable("0"); + cfg.setCreateTime(createTime); + cfg.setCreatorId(entity.getCurrentUser().getId()); + cfg.setIsValid(Constants.VALID_NO); + cfg.setIsAudit(Constants.AUDIT_NOT_YET); + cfg.setGroupId(serviceGroupId); + ipCommGroupCfgDao.insertForBatch(cfg); + } // 更新分组状态 groupManageService.updateGroupStatus(policyGroupInfos, 5); - //TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置 transObjGroupToMaat(policyGroupInfos); } @@ -150,11 +160,15 @@ public class IpCommGroupCfgService extends BaseService { String ids = ""; batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseIpCfg cfg:cfgs) { - if(!ids.contains(cfg.getGroupId()+"")) { - ids += ","+cfg.getGroupId(); - } IpCommCfg ipCommCfg=new 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); } @@ -163,7 +177,7 @@ public class IpCommGroupCfgService extends BaseService { // 更新分组状态 String serviceGroupIds = ids.substring(1); List policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); - groupManageService.updateGroupStatus(policyGroupInfos, 5); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE); }finally { if(batchSqlSession != null){ diff --git a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java index c0fb8ef5c..7e67879b1 100644 --- a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java @@ -65,9 +65,14 @@ public class ScriberIdCommGroupService extends CrudService policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()); - for (int i = 0; i < entity.getScriberIdCommGroupList().size(); i++) { - BeanUtils.copyProperties(entity, entity.getScriberIdCommGroupList().get(i), new String[]{"cfgId"}); + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.SUBID_OBJ_GROUP_TYPE); + List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+""); + + for (ScriberIdCommCfg cfg : entity.getScriberIdCommGroupList()) { + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + Integer regionId = 0; List regionIds = ConfigServiceUtil.getId(3, 1); if(regionIds!=null && regionIds.size()>0){ @@ -75,28 +80,27 @@ public class ScriberIdCommGroupService extends CrudService policyGroupInfos = new ArrayList(); - if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { - groupManageService.updateGroupStatus(policyGroupInfos, 9); - policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); + policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old + if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改 + 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); } @@ -132,7 +141,7 @@ public class ScriberIdCommGroupService extends CrudService policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); scriberIdCommGroupDao.delete(ids); // 更新分组状态 - groupManageService.updateGroupStatus(policyGroupInfos, 9); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE); transObjGroupToMaat(policyGroupInfos); } @@ -154,11 +163,15 @@ public class ScriberIdCommGroupService extends CrudService cfg:cfgs) { - if(!ids.contains(cfg.getGroupId()+"")) { - ids += ","+cfg.getGroupId(); - } 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); } batchSqlSession.commit(); @@ -166,7 +179,7 @@ public class ScriberIdCommGroupService extends CrudService policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); - groupManageService.updateGroupStatus(policyGroupInfos, 9); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE); }finally { if(batchSqlSession != null){ diff --git a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java index afde302a5..752e26999 100644 --- a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java +++ b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java @@ -64,9 +64,14 @@ public class UrlCommGroupService extends CrudService, UrlCom public void saveUrlCommGroupCfg(CfgIndexInfo entity) { Date createTime=new Date(); if(entity.getUrlCommGroupList()!=null) { - List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()); - for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) { - BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"}); + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.URL_OBJ_GROUP_TYPE); + List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupId+""); + + for (UrlCommCfg cfg : entity.getUrlCommGroupList()) { + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + Integer regionId = 0; List regionIds = ConfigServiceUtil.getId(3, 1); if(regionIds!=null && regionIds.size()>0){ @@ -74,27 +79,28 @@ public class UrlCommGroupService extends CrudService, UrlCom }else { throw new MaatConvertException("Get region id failed"); } - entity.getUrlCommGroupList().get(i).setRegionId(regionId); - entity.getUrlCommGroupList().get(i).setRequestId(0); - entity.getUrlCommGroupList().get(i).setClassify("0"); - entity.getUrlCommGroupList().get(i).setAttribute("0"); - entity.getUrlCommGroupList().get(i).setLable("0"); - entity.getUrlCommGroupList().get(i).setIsHexbin(0); - entity.getUrlCommGroupList().get(i).setCreateTime(createTime); - entity.getUrlCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId()); - entity.getUrlCommGroupList().get(i).setIsValid(Constants.VALID_NO); - entity.getUrlCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET); - if(entity.getUrlCommGroupList().get(i).getCfgKeywords().contains("***and***")){ - entity.getUrlCommGroupList().get(i).setExprType(1); - }else{ - entity.getUrlCommGroupList().get(i).setExprType(0); - } - entity.getUrlCommGroupList().get(i).setGroupId(entity.getGroupId()); + cfg.setRegionId(regionId); + + cfg.setRequestId(0); + cfg.setClassify("0"); + cfg.setAttribute("0"); + cfg.setLable("0"); + cfg.setIsHexbin(0); + 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); + urlCommGroupDao.insertUrlCommGroupCfg(cfg); - urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i)); } // 更新分组状态 - groupManageService.updateGroupStatus(policyGroupInfos, 7); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE); transObjGroupToMaat(policyGroupInfos); } } @@ -111,15 +117,20 @@ public class UrlCommGroupService extends CrudService, UrlCom }else{ entity.setExprType(0); } + + // 获取分组ID + Integer serviceGroupId = groupManageService.getServiceGroupId(entity.getGroupName(), Constants.URL_OBJ_GROUP_TYPE); + entity.setGroupId(serviceGroupId); urlCommGroupDao.update(entity); // 更新分组状态 List policyGroupInfos = new ArrayList(); - if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { - groupManageService.updateGroupStatus(policyGroupInfos, 7); - policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); + policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1())); // old + if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) { // 分组已修改 + 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); } @@ -129,7 +140,7 @@ public class UrlCommGroupService extends CrudService, UrlCom urlCommGroupDao.delete(ids); // 更新分组状态 List policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); - groupManageService.updateGroupStatus(policyGroupInfos, 7); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE); transObjGroupToMaat(policyGroupInfos); } @@ -151,11 +162,15 @@ public class UrlCommGroupService extends CrudService, UrlCom String ids = ""; batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(BaseStringCfg cfg:cfgs) { - if(!ids.contains(cfg.getGroupId()+"")) { - ids += ","+cfg.getGroupId(); - } 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); } batchSqlSession.commit(); @@ -163,7 +178,7 @@ public class UrlCommGroupService extends CrudService, UrlCom // 更新分组状态 String serviceGroupIds = ids.substring(1); List policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds); - groupManageService.updateGroupStatus(policyGroupInfos, 7); + groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE); }finally { if(batchSqlSession != null){ diff --git a/src/main/resources/sql/20190610/common_group_save_cfg.sql b/src/main/resources/sql/20190610/common_group_save_cfg.sql index c33573726..c90372c03 100644 --- a/src/main/resources/sql/20190610/common_group_save_cfg.sql +++ b/src/main/resources/sql/20190610/common_group_save_cfg.sql @@ -24,6 +24,15 @@ INSERT INTO `sys_data_dictionary_item` ( `dictionary_id` ) VALUES + ( + '5', + 'IP GROUP', + '普通IP组', + '0', + '1', + '1', + (SELECT id FROM sys_data_dictionary_name WHERE mark = 'GROUP_TYPE') + ), ( '7', 'URL GROUP', diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp index 2f6e99881..fba06c19d 100644 --- a/src/main/webapp/WEB-INF/include/header.jsp +++ b/src/main/webapp/WEB-INF/include/header.jsp @@ -38,6 +38,8 @@ + +