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

(1)修复in() sql中 使用了#导致的bug,#修改为$

Browse Source 
(2)asn 策略组删除时判断其下有没有新增的ip，如果有，则不允许删除
This commit is contained in:
wangxin
2018-09-03 11:23:10 +08:00
parent bcba4c785d
commit bf0d81421b
10 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
View File

@@ -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;
}
}

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

@@ -14,6 +14,7 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
public void updateValid(@Param("isValid")Integer isValid,@Param("ids")String ids);
public void updateIssued(AsnIpCfg cfg);
public List<AsnIpCfg> getByIds(@Param("ids")String ids);
public List<Integer> hasGroupIds(@Param("ids")String ids);
public List<AsnIpCfg> findAllList(AsnIpCfg cfg);
public List<ConfigGroupInfo> findPolicyGroupInfosByType(@Param("groupId")Integer groupId);
public List<Integer> findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId);

7
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -198,7 +198,7 @@
select
<include refid="columns"></include>
from asn_ip_cfg r
where r.cfg_id in (#{ids})
where r.cfg_id in (${ids}) and is_valid !=-1
</select>
<insert id="insert" parameterType="com.nis.domain.basics.AsnIpCfg" >
@@ -374,7 +374,7 @@
</where>
</update>
<update id="updateValid" parameterType="com.nis.domain.basics.AsnIpCfg" >
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})
</update>
<select id="findPolicyGroupInfosByType" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
select id,group_id,group_name,is_issued,insert_time,update_time,group_type
@@ -383,5 +383,8 @@
<select id="findOtherIps" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select 1 from asn_ip_cfg where is_valid=1 and asn_ip_group=#{groupId} and cfg_id !=#{cfgId} limit 2
</select>
<select id="hasGroupIds" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select 1 from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) limit 2
</select>
</mapper>

2
src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
View File

@@ -254,7 +254,7 @@
where cfg_id = #{cfgId,jdbcType=BIGINT}
</update>
<update id="updateValid" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
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})
</update>
<select id="getConfigGroupInfoList" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
SELECT c.id,c.group_id,c.group_name,c.is_issued,c.insert_time,c.update_time,c.group_type FROM (

2
src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java
View File

@@ -43,7 +43,7 @@ public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
List<SpecificServiceCfg> getChildrenById(Integer specServiceId);
ConfigGroupInfo getConfigGroupInfoByGroupId(Integer groupId);
Integer getIssuedConfigGroupInfoByGroupIds(String groupIds);
Integer getIssuedConfigGroupInfoByGroupIds(@Param("groupIds")String groupIds);
Integer insertConfigGroupInfo(ConfigGroupInfo entity);

2
src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
View File

@@ -216,7 +216,7 @@
from config_group_info c where c.group_id= #{groupId}
</select>
<select id="getIssuedConfigGroupInfoByGroupIds" resultType="java.lang.Integer" parameterType="java.lang.String">
select count(1) from config_group_info c where c.group_id in(#{groupIds}) and is_issued=1
select count(1) from config_group_info c where c.group_id in(${groupIds}) and is_issued=1
</select>
<!-- 修改配置分组状态信息 -->

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

@@ -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<Integer> hasIpList=asnIpCfgDao.hasGroupIds(groupIds);
if(hasIpList!=null&&hasIpList.size()>0) {
return true;
}
return false;
}
public void getByIds(String ids) {
// TODO Auto-generated method stub
}
}

3
src/main/resources/messages/message_en.properties
View File

@@ -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
asn_ip_group=ASN IP Group
can_not_delete_has_ip_asn_group=Can not delete ASN group which has ASN IP

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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
asn_ip_group=ASN IP\u7EC4
can_not_delete_has_ip_asn_group=\u4E0D\u80FD\u5220\u9664\u5305\u542BASN IP\u7684 ASN\u7EC4

17
src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
View File

@@ -47,6 +47,7 @@
ids = str.substr(0,str.length-1);
}
var canDel=true;
var tip='<spring:message code="can_not_delete_issued_asn_group"/>';
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='<spring:message code="can_not_delete_has_ip_asn_group"/>';
}
}
});
}
}
if(canDel){
window.location = url+"&ids="+ids;
}else{
$.jBox.tip('<spring:message code="can_not_delete_issued_asn_group"/>');
$.jBox.tip(tip);
return false;
}
}