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

调整删除asn ip验证，只有下发过的asn ip需要ajax后台判断。调整ajax判断sql

Browse Source
This commit is contained in:
wangxin
2018-09-28 11:49:53 +08:00
parent 520a336037
commit ab50f58560
5 changed files with 296 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/basics/AsnIpController.java
View File

@@ -120,9 +120,9 @@ public class AsnIpController extends BaseController{
}
@RequestMapping(value="ajaxIsLast",method=RequestMethod.POST)
@ResponseBody
public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds){
if(StringUtils.isNotBlank(serviceGroupIds)) {
return asnIpCfgService.hasLastIp(serviceGroupIds);
public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds,@RequestParam(required=true,value="ids")String ids){
if(StringUtils.isNotBlank(serviceGroupIds)&&StringUtils.isNotBlank(ids)) {
return asnIpCfgService.hasLastIp(serviceGroupIds,ids);
}
return false;
}

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

@@ -18,5 +18,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
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);
public List<Integer> countValidIPs(@Param("ids")String ids);
public List<Integer> countValidIPs(@Param("groups")String groups,@Param("ids")String ids);
}

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

@@ -387,7 +387,7 @@
select 1 from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) limit 1
</select>
<select id="countValidIPs" resultType="java.lang.Integer" parameterType="java.lang.Integer">
select count(1) from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) GROUP BY asn_ip_group;
select count(1) from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${groups}) and cfg_id not in(${ids}) GROUP BY asn_ip_group;
</select>
</mapper>

9
src/main/java/com/nis/web/service/basics/AsnIpCfgService.java
View File

@@ -178,14 +178,17 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
* @param serviceGroupIds
* @return
*/
public boolean hasLastIp(String serviceGroupIds) {
public boolean hasLastIp(String serviceGroupIds,String ids) {
// TODO Auto-generated method stub
for(String groupId:serviceGroupIds.split(",")) {
Long.parseLong(groupId);
}
List<Integer> countList=asnIpCfgDao.countValidIPs(serviceGroupIds);
List<Integer> countList=asnIpCfgDao.countValidIPs(serviceGroupIds,ids);
if(countList.size()==0) {
return true;
}
for(Integer count:countList) {
if(count==1) {
if(count==0) {
return true;
}
}