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

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);
}
@ResponseBody
@RequestMapping(value="ajaxGetGroupInfoByType",method=RequestMethod.GET)
public List<CommonGroupInfo> ajaxGetGroupInfoByType(Integer groupType){
return commonGroupManageService.findCommonGroupInfosByType(groupType);
}
// 数据导出
@RequestMapping(value = "exportGroup")
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);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(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("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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(8);
model.addAttribute("policyGroupInfos", groupInfos);
/* List<CommonGroupInfo> 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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(8);
List<CommonGroupInfo> 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++;
}

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.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<IpCommCfg> page = ipCommGroupCfgService.findPage(new Page<IpCommCfg>(request, response, "r"),entity);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(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("regionList", regionList);
@@ -70,8 +69,8 @@ public class IpCommGroupController extends BaseController {
cfg.setGroupType(5);
initFormCondition(model, cfg);
List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(5);
model.addAttribute("policyGroupInfos", groupInfos);
/*List<CommonGroupInfo> 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<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(5);
List<CommonGroupInfo> 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++;
}

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);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(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("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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(9);
model.addAttribute("policyGroupInfos", groupInfos);
/*List<CommonGroupInfo> 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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(9);
List<CommonGroupInfo> 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++;
}

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);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(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("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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7);
model.addAttribute("policyGroupInfos", groupInfos);
/*List<CommonGroupInfo> 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<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7);
List<CommonGroupInfo> 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++;
}