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

(1)策略分组修改，增加分租asn,id 为4

Browse Source 
(2)策略分组删除时判断ASN分组是否已经下发过，如果已经下发过，则不能删除
(3)配置分组修改不能更新分组类型
This commit is contained in:
wangxin
2018-08-27 21:10:13 +08:00
parent 4259117e94
commit 18bfc299e4
12 changed files with 166 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,12 @@ import org.springframework.transaction.annotation.Transactional;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
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.PolicyGroupInfoDao;
import com.nis.web.dao.specific.SpecificServiceCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -18,7 +22,9 @@ import com.nis.web.service.BaseService;
public class PolicyGroupInfoService extends BaseService{
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
private PolicyGroupInfoDao policyGroupInfoDao;
@Autowired
private SpecificServiceCfgDao specificServiceCfgDao;
/**
* @param page
@@ -47,13 +53,34 @@ public class PolicyGroupInfoService extends BaseService{
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveOrUpdate(PolicyGroupInfo entity){
public void saveOrUpdate(PolicyGroupInfo entity) throws MaatConvertException{
entity.setIsValid(1);
//新增
if(entity.getGroupId()==null){
Date createTime=new Date();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
//asn类型从综合服务获取groupId
if(4==entity.getGroupType().intValue()) {
int serviceGroupId=0;
List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
if(groupIds.size()>0) {
serviceGroupId=groupIds.get(0).intValue();
}else {
throw new MaatConvertException("Get asn group id failed");
}
entity.setServiceGroupId(serviceGroupId);
//新增协议分组
ConfigGroupInfo group = specificServiceCfgDao.getConfigGroupInfoByGroupId(serviceGroupId);
if(group==null){
group = new ConfigGroupInfo();
group.setGroupId(serviceGroupId);
group.setGroupName(entity.getGroupName());
group.setIsIssued(0);
group.setGroupType(entity.getGroupType());
specificServiceCfgDao.insertConfigGroupInfo(group);
}
}
policyGroupInfoDao.insert(entity);
//修改
}else{
@@ -79,5 +106,12 @@ public class PolicyGroupInfoService extends BaseService{
}
}
}
public boolean checkIsIssued(String groupIds) {
for(String groupId:groupIds.split(",")) {
Integer.parseInt(groupId);
}
Integer count=specificServiceCfgDao.getIssuedConfigGroupInfoByGroupIds(groupIds);
if(count>0) return true;
return false;
}
}