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

1.增加区域管控校验，不可重复 2.IP复用配置表单从group_area_info表中获取分组

Browse Source
This commit is contained in:
zhangwq
2018-11-02 12:51:27 +08:00
parent 1a01f78a08
commit 6ab181c329
10 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java
View File

@@ -54,7 +54,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
}
//查询ip复用地址池配置的policyGroup列表
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(3);
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(3);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", cfg);
return "/cfg/maintenance/ipMultiplexPool/form";
@@ -160,7 +160,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
}
//查询ip复用地址池配置的policyGroup列表
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(2);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("_cfg", cfg);
return "/cfg/maintenance/ipMultiplexPool/snatform";

32
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -133,19 +133,9 @@ public class IpMultiplexController extends CommonController {
@RequiresPermissions(value={"snat_policy:config"})
public String snatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) {
this._ipForm(cfgName,model, ids, functionId, entity);
SysDataDictionaryItem dict=null;
List<SysDataDictionaryItem> dictList= DictUtils.getDictList("GROUP_TYPE");
for(SysDataDictionaryItem di:dictList){
if("2".equals(di.getItemCode())){
dict=di;
break;
}
}
if(dict!=null){
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(Integer.parseInt(dict.getItemCode()));
model.addAttribute("policyGroups", policyGroups);
}
// 获取拥有区域信息的策略分组
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.getHasAreaPolicyGroups(2);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
return "/cfg/manipulation/ipmulitiplex/snatPolicyForm";
}
@@ -182,19 +172,9 @@ public class IpMultiplexController extends CommonController {
@RequiresPermissions(value={"dnat_policy:config"})
public String dnatPolicyForm(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) {
this._ipForm(cfgName,model, ids, functionId, entity);
SysDataDictionaryItem dict=null;
List<SysDataDictionaryItem> dictList= DictUtils.getDictList("GROUP_TYPE");
for(SysDataDictionaryItem di:dictList){
if("3".equals(di.getItemCode())){
dict=di;
break;
}
}
if(dict!=null){
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(Integer.parseInt(dict.getItemCode()));
model.addAttribute("policyGroups", policyGroups);
}
// 获取拥有区域信息的策略分组
List<PolicyGroupInfo> policyGroups=policyGroupInfoService.getHasAreaPolicyGroups(3);
model.addAttribute("policyGroups", policyGroups);
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm";
}

1
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java
View File

@@ -18,4 +18,5 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
List<PolicyGroupInfo> findNatPolicyGroups();
PolicyGroupInfo getInfoByAsnNo(PolicyGroupInfo policyGroupInfo);
List<PolicyGroupInfo> getHasAreaPolicyGroups(int groupType);
}

13
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -176,4 +176,17 @@
</if>
</trim>
</select>
<select id="getHasAreaPolicyGroups" resultType="com.nis.domain.basics.PolicyGroupInfo">
SELECT
<include refid="PolicyGroupInfoColumns"/>
FROM
policy_group_info r
WHERE
r.is_valid = 1 AND
r.group_type = #{groupType,jdbcType=INTEGER} AND
r.group_id IN (
SELECT ga.group_id FROM group_area_info ga WHERE ga.is_valid != -1
)
</select>
</mapper>

10
src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
View File

@@ -145,8 +145,12 @@ public class PolicyGroupInfoService extends BaseService{
return policyGroupInfoDao.getInfoByAsnNo(policyGroupInfo);
}
public void getByIds(String ids) {
// TODO Auto-generated method stub
/**
* IP复用配置表单-获取拥有区域信息的策略分组
* @param groupType
* @return
*/
public List<PolicyGroupInfo> getHasAreaPolicyGroups(int groupType) {
return policyGroupInfoDao.getHasAreaPolicyGroups(groupType);
}
}