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

更新组状态方法修改

Browse Source
This commit is contained in:
wangxin
2019-06-10 14:10:00 +08:00
parent b22cfec67f
commit 2f74cd03cc
11 changed files with 364 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.nis.domain.basics.PolicyGroupInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -110,28 +111,39 @@ public class CommonGroupManageService extends BaseService{
/**
* 更新分组状态 policy_group_info ud_flag：0（无有效的域配置） 1（存在有效的域配置）
* @param serviceGroupId
* @param policyGroupInfos
* @param groupType
*/
public void updateGroupStatus(String serviceGroupId, Integer groupType) {
public void updateGroupStatus(List<PolicyGroupInfo> policyGroupInfos, Integer groupType) {
/**
* void updateUdFlag(String groupIds, Integer udFlag, Integer groupType);
*/
Integer udFlag = 0;
if(groupType == 5) { // IP
List<IpCommCfg> list = ipCommGroupCfgDao.getCfgInfoByGroupIds(serviceGroupId);
if(list.size() > 0) {
udFlag = 1; // 可用
for(PolicyGroupInfo info:policyGroupInfos){
boolean update=false;
Integer udFlag = 0;
if(groupType == 5) { // IP
List<IpCommCfg> list = ipCommGroupCfgDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
if(list.size() > 0&&info.getUdFlag().equals(0)) {
update=true;
udFlag = 1; // 可用
}else if(list.size()==0&&info.getUdFlag().equals(2)){
update=true;
}
}else if(groupType == 7) { // URL
List<UrlCommCfg> list = urlCommGroupDao.getCfgInfoByGroupIds(info.getServiceGroupId().toString());
if(list.size() > 0&&info.getUdFlag().equals(0)) {
update=true;
udFlag = 1;
}else if(list.size()==0&&info.getUdFlag().equals(2)){
update=true;
}
}
}else if(groupType == 7) { // URL
List<UrlCommCfg> list = urlCommGroupDao.getCfgInfoByGroupIds(serviceGroupId);
if(list.size() > 0) {
udFlag = 1;
if(update){
commonGroupManageDao.updateGroupStatus(info.getServiceGroupId().toString(), udFlag, groupType);
}
}
commonGroupManageDao.updateGroupStatus(serviceGroupId, udFlag, groupType);
}
}

32
src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
View File

@@ -5,6 +5,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import org.apache.commons.collections.CollectionUtils;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
@@ -32,9 +34,11 @@ public class IpCommGroupCfgService extends BaseService {
@Autowired
private IpCommGroupCfgDao ipCommGroupCfgDao;
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
private CommonGroupManageService groupManageService = SpringContextHolder.getBean(CommonGroupManageService.class);
/**
* @param page
* @param entity
@@ -69,11 +73,13 @@ public class IpCommGroupCfgService extends BaseService {
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void update(IpCommCfg entity){
List<PolicyGroupInfo> policyGroupInfosOld=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1());
List<PolicyGroupInfo> policyGroupInfosNew=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
ipCommGroupCfgDao.update(entity);
// 更新分组状态
groupManageService.updateGroupStatus(entity.getUserRegion1(), 5); // old
groupManageService.updateGroupStatus(entity.getGroupId()+"", 5); // new
groupManageService.updateGroupStatus(policyGroupInfosOld, 5); // old
groupManageService.updateGroupStatus(policyGroupInfosNew, 5); // new
}
@@ -87,10 +93,10 @@ public class IpCommGroupCfgService extends BaseService {
//新增
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveIpCommGroupCfg(CfgIndexInfo entity) {
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
Date createTime=new Date();
if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) {
BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"});
Integer regionId = 0;
@@ -113,19 +119,22 @@ public class IpCommGroupCfgService extends BaseService {
ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i));
}
// 更新分组状态
groupManageService.updateGroupStatus(entity.getGroupId()+"", 5);
groupManageService.updateGroupStatus(policyGroupInfos, 5);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
//transObjGroupToMaat(policyGroupInfos);
}
}
public void delete(String ids, String compileIds) {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(compileIds);
if(ids==null) {
throw new RuntimeException("ids is null!");
}
ipCommGroupCfgDao.delete(ids);
// 更新分组状态
groupManageService.updateGroupStatus(compileIds, 5);
groupManageService.updateGroupStatus(policyGroupInfos, 5);
//transObjGroupToMaat(policyGroupInfos);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
@@ -174,5 +183,4 @@ public class IpCommGroupCfgService extends BaseService {
cfgs.clear();
cfgs=null;
}
}

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

@@ -173,5 +173,19 @@ public class PolicyGroupInfoService extends BaseService{
public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){
return policyGroupInfoDao.getGroupInfo(policyGroupInfo);
}
/**
* 公共组相关功能使用
*/
public List<PolicyGroupInfo> findPolicyGroupInfosByTypeforUD(Integer type,Integer flag) {
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(type,flag);
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosByTypeforUD(Integer type,Integer flag,Integer limit) {
List<PolicyGroupInfo> list=policyGroupInfoDao.findLimitedPolicyGroupInfosByTypeForUD(type,flag,limit);
return list;
}
public List<PolicyGroupInfo> findPolicyByServiceGroupInfoList(String serviceGroupIds) {
return policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
}
}

18
src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
View File

@@ -3,6 +3,8 @@ package com.nis.web.service.basics;
import java.util.Date;
import java.util.List;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.web.dao.basics.PolicyGroupInfoDao;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,7 +26,8 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
@Autowired
private UrlCommGroupDao urlCommGroupDao;
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
private CommonGroupManageService groupManageService = SpringContextHolder.getBean(CommonGroupManageService.class);
public Page<UrlCommCfg> findPage(Page<UrlCommCfg> page, UrlCommCfg entity) {
@@ -52,6 +55,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveUrlCommGroupCfg(CfgIndexInfo entity) {
Date createTime=new Date();
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
if(entity.getUrlCommGroupList()!=null) {
for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) {
BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"});
@@ -82,7 +86,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
}
// 更新分组状态
groupManageService.updateGroupStatus(entity.getGroupId()+"", 7);
groupManageService.updateGroupStatus(policyGroupInfos, 7);
}
}
@@ -100,10 +104,11 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
entity.setExprType(0);
}
urlCommGroupDao.update(entity);
List<PolicyGroupInfo> policyGroupInfosOld=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1());
List<PolicyGroupInfo> policyGroupInfosNew=policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString());
// 更新分组状态
groupManageService.updateGroupStatus(entity.getUserRegion1(), 7); // old
groupManageService.updateGroupStatus(entity.getGroupId()+"", 7); // new
groupManageService.updateGroupStatus(policyGroupInfosOld, 7); // old
groupManageService.updateGroupStatus(policyGroupInfosNew, 7); // new
}
@@ -111,7 +116,8 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
public void delete(String ids, String groupIds) {
urlCommGroupDao.delete(ids);
// 更新分组状态
groupManageService.updateGroupStatus(groupIds, 7);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 7);
}
public List<UrlCommCfg> getByIds(String ids) {