diff --git a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java index 5edca6004..52c71f74d 100644 --- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java +++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java @@ -108,4 +108,12 @@ public class PolicyGroupController extends BaseController { } return false; } + @RequestMapping(value="ajaxHasAsnIPs",method=RequestMethod.POST) + @ResponseBody + public boolean ajaxHasAsnIPs(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds){ + if(StringUtils.isNotBlank(serviceGroupIds)) { + return policyGroupInfoService.checkIps(serviceGroupIds); + } + return false; + } } diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java index 59f329e8b..11ad4ba80 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java @@ -14,6 +14,7 @@ public interface AsnIpCfgDao extends CrudDao{ public void updateValid(@Param("isValid")Integer isValid,@Param("ids")String ids); public void updateIssued(AsnIpCfg cfg); public List getByIds(@Param("ids")String ids); + public List hasGroupIds(@Param("ids")String ids); public List findAllList(AsnIpCfg cfg); public List findPolicyGroupInfosByType(@Param("groupId")Integer groupId); public List findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId); diff --git a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml index a343f1dfc..746556359 100644 --- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml @@ -198,7 +198,7 @@ select from asn_ip_cfg r - where r.cfg_id in (#{ids}) + where r.cfg_id in (${ids}) and is_valid !=-1 @@ -374,7 +374,7 @@ - update asn_ip_cfg set is_valid=#{isValid} where cfg_id in (#{ids}) + update asn_ip_cfg set is_valid=#{isValid} where cfg_id in (${ids}) select 1 from asn_ip_cfg where is_valid=1 and asn_ip_group=#{groupId} and cfg_id !=#{cfgId} limit 2 + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml index b64b3b484..9c0b7cb1e 100644 --- a/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml @@ -254,7 +254,7 @@ where cfg_id = #{cfgId,jdbcType=BIGINT} - update cfg_index_info set is_valid=#{isValid} where cfg_id in (#{ids}) + update cfg_index_info set is_valid=#{isValid} where cfg_id in (${ids}) diff --git a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java index b0b9d93ce..0db247050 100644 --- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java @@ -13,6 +13,7 @@ import com.nis.domain.specific.ConfigGroupInfo; import com.nis.exceptions.MaatConvertException; import com.nis.util.ConfigServiceUtil; import com.nis.util.StringUtil; +import com.nis.web.dao.basics.AsnIpCfgDao; import com.nis.web.dao.basics.PolicyGroupInfoDao; import com.nis.web.dao.specific.SpecificServiceCfgDao; import com.nis.web.security.UserUtils; @@ -25,6 +26,8 @@ public class PolicyGroupInfoService extends BaseService{ private PolicyGroupInfoDao policyGroupInfoDao; @Autowired private SpecificServiceCfgDao specificServiceCfgDao; + @Autowired + private AsnIpCfgDao asnIpCfgDao; /** * @param page @@ -118,4 +121,18 @@ public class PolicyGroupInfoService extends BaseService{ if(count>0) return true; return false; } + public boolean checkIps(String groupIds) { + for(String groupId:groupIds.split(",")) { + Integer.parseInt(groupId); + } + List hasIpList=asnIpCfgDao.hasGroupIds(groupIds); + if(hasIpList!=null&&hasIpList.size()>0) { + return true; + } + return false; + } + public void getByIds(String ids) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 9b8e18c53..3febf49dd 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1137,4 +1137,5 @@ can_not_edit_issued_ans_ip=Can not edit issued ASN IP is_issued=Is Issued asn_ip_configuration=ASN IP Configuration asn_policy=ASN Policy -asn_ip_group=ASN IP Group \ No newline at end of file +asn_ip_group=ASN IP Group +can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 6398cffd9..00247a510 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1134,4 +1134,5 @@ can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC is_issued=\u662F\u5426\u4E0B\u53D1 asn_ip_configuration=ASN IP\u914D\u7F6E asn_policy=ASN\u7B56\u7565 -asn_ip_group=ASN IP\u7EC4 \ No newline at end of file +asn_ip_group=ASN IP\u7EC4 +can_not_delete_has_ip_asn_group=\u4E0D\u80FD\u5220\u9664\u5305\u542BASN IP\u7684 ASN\u7EC4 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index 3e8402d7f..a24ffd52f 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -47,6 +47,7 @@ ids = str.substr(0,str.length-1); } var canDel=true; + var tip=''; if(serviceGroupIds.length>0){ $.ajax({ type:'post', @@ -59,11 +60,25 @@ } } }); + if(canDel){ + $.ajax({ + type:'post', + url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs', + data:{"serviceGroupIds":serviceGroupIds.join(',')}, + async:false, + success:function(data,textStatus){//处理返回结果 + if(data){ + canDel=false; + tip=''; + } + } + }); + } } if(canDel){ window.location = url+"&ids="+ids; }else{ - $.jBox.tip(''); + $.jBox.tip(tip); return false; } }