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

修正ObjectList管理域配置批量删除时 错误取消策略配置bug

Browse Source
This commit is contained in:
zhangwenqing
2019-06-26 17:40:47 +08:00
parent c0f424579b
commit 3ddd809066
5 changed files with 376 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,6 +323,30 @@ public class CommonGroupManageService extends BaseService{
} }
return map; return map;
} }
public boolean checkCancelCfg(String groupId, Integer groupType) {
boolean flag = false;
String keyString = "";
if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP
keyString = "ipGroup";
}else if(groupType == Constants.URL_OBJ_GROUP_TYPE) { // URL
keyString = "urlGroup";
}else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain
keyString = "domainGroup";
}else if(groupType == Constants.SUBID_OBJ_GROUP_TYPE) { // ScriberId
keyString = "subscribeIdGroup";
}
Map<String,String> searchMap = new HashMap<String,String>();
searchMap.put(keyString, ","+groupId+",");
Integer compileId = commonGroupManageDao.getCompileIdByGroupId(gsonToJson(searchMap));
if(compileId != null) {
flag = true;
}
return flag;
}
} }

166
src/main/java/com/nis/web/service/basics/DomainCommGroupService.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.controller.configuration.ObjectGroupController; import com.nis.web.controller.configuration.ObjectGroupController;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
@@ -154,90 +155,93 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(String ids, String groupIds, DomainCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception { public void delete(String ids, String groupIds, DomainCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(ids == null) { if(ids == null) {
groupIds = ""; long start = System.currentTimeMillis();
String cfgIds = "";
String serviceGroupIds = "";
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消 Page<DomainCommCfg> page = new Page<DomainCommCfg>(request, response, "r");
List<DomainCommCfg> set = domainCommGroupDao.getGroupIds(cfg); page.setOrderBy("");
if(set.size() == 0) { // 无可删除配置 page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
return; page.setPageNo(1);
}else { page.setLastPage(false);
for (DomainCommCfg domainCommCfg : set) {
Integer groupId = domainCommCfg.getGroupId(); boolean hasData = true;
cfgIds += ","+domainCommCfg.getCfgId(); while(hasData){
if(!serviceGroupIds.contains(groupId+"")) { page.setPageNo(1);
serviceGroupIds += ","+groupId; page.setLastPage(false);
} cfg.setIsValid(null);
}
cfgIds = cfgIds.substring(1); List<DomainCommCfg> list = this.findPage(page, cfg).getList();
serviceGroupIds = serviceGroupIds.substring(1); if(!StringUtil.isEmpty(list)) {
} groupIds = "";
domainCommGroupDao.delete(cfgIds); String cfgIds = "";
String serviceGroupIds = "";
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = ""; for (DomainCommCfg domainCommCfg : list) {
for (String groupId : strings) { Integer groupId = domainCommCfg.getGroupId();
Integer size = domainCommGroupDao.getCfgInfoByGroupIds(groupId); cfgIds += ","+domainCommCfg.getCfgId();
if(size == 0) { // 需配置取消 if(!serviceGroupIds.contains(groupId+"")) {
serviceGroupIds += ","+groupId; serviceGroupIds += ","+groupId;
}else { // 需配置更新 }
groupIds += ","+groupId; }
} cfgIds = cfgIds.substring(1);
serviceGroupIds = serviceGroupIds.substring(1);
domainCommGroupDao.delete(cfgIds);
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = "";
for (String groupId : strings) {
Integer size = domainCommGroupDao.getCfgInfoByGroupIds(groupId);
if(size == 0) { // 需配置取消
boolean flag = groupManageService.checkCancelCfg(groupId, Constants.DOMAIN_OBJ_GROUP_TYPE);
if(flag) { // 需配置更新
serviceGroupIds += ","+groupId;
}else {
groupIds += ","+groupId;
}
}else { // 需配置更新
groupIds += ","+groupId;
}
}
// 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) {
serviceGroupIds = serviceGroupIds.substring(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
Properties props = groupController.getMsgProp();
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos);
}
}else {
hasData = false;
}
} }
// 配置取消 long end = System.currentTimeMillis();
if(StringUtils.isNotBlank(serviceGroupIds)) { logger.warn("域名组域配置，批量删除耗时："+(end-start));
serviceGroupIds = serviceGroupIds.substring(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
Properties props = groupController.getMsgProp();
// 配置未生效
/*String updateStatusGroupIds = "";
for (String groupId : serviceGroupIds.split(",")) {
List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
if(list.size() > 0) {
updateStatusGroupIds += ","+groupId;
}
}
if(StringUtils.isNotBlank(updateStatusGroupIds)) {
updateStatusGroupIds = updateStatusGroupIds.substring(1);
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(updateStatusGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
entity.setIsValid(Constants.VALID_NO);
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
}*/
// 配置已生效
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
transObjGroupToMaat(policyGroupInfos);
}
}else { }else {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
domainCommGroupDao.delete(ids); domainCommGroupDao.delete(ids);

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

@@ -30,6 +30,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.controller.configuration.ObjectGroupController; import com.nis.web.controller.configuration.ObjectGroupController;
import com.nis.web.dao.basics.CommonGroupManageDao; import com.nis.web.dao.basics.CommonGroupManageDao;
@@ -147,38 +148,90 @@ public class IpCommGroupCfgService extends BaseService {
public void delete(String ids, String groupIds, IpCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception { public void delete(String ids, String groupIds, IpCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(ids == null) { if(ids == null) {
groupIds = ""; long start = System.currentTimeMillis();
String cfgIds = "";
String serviceGroupIds = "";
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置）-> 配置分别操作更新或取消 Page<IpCommCfg> page = new Page<IpCommCfg>(request, response, "r");
List<IpCommCfg> set = ipCommGroupCfgDao.getGroupIds(cfg); page.setOrderBy("");
if(set.size() == 0) { // 无可删除配置 page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
return; page.setPageNo(1);
}else { page.setLastPage(false);
for (IpCommCfg ipCommCfg : set) {
Integer groupId = ipCommCfg.getGroupId(); boolean hasData = true;
cfgIds += ","+ipCommCfg.getCfgId(); while(hasData){
if(!serviceGroupIds.contains(groupId+"")) { page.setPageNo(1);
serviceGroupIds += ","+groupId; page.setLastPage(false);
} cfg.setIsValid(null);
}
cfgIds = cfgIds.substring(1); List<IpCommCfg> list = this.findPage(page, cfg).getList();
serviceGroupIds = serviceGroupIds.substring(1); if(!StringUtil.isEmpty(list)) {
} groupIds = "";
ipCommGroupCfgDao.delete(cfgIds); String cfgIds = "";
String serviceGroupIds = "";
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = ""; for (IpCommCfg ipCommCfg : list) {
for (String groupId : strings) { Integer groupId = ipCommCfg.getGroupId();
Integer size = ipCommGroupCfgDao.getCfgInfoByGroupIds(groupId); cfgIds += ","+ipCommCfg.getCfgId();
if(size == 0) { // 需配置取消 if(!serviceGroupIds.contains(groupId+"")) {
serviceGroupIds += ","+groupId; serviceGroupIds += ","+groupId;
}else { // 需配置更新 }
groupIds += ","+groupId; }
} cfgIds = cfgIds.substring(1);
serviceGroupIds = serviceGroupIds.substring(1);
ipCommGroupCfgDao.delete(cfgIds);
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置）-> 配置分别操作更新或取消
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = "";
for (String groupId : strings) {
Integer size = ipCommGroupCfgDao.getCfgInfoByGroupIds(groupId);
if(size == 0) { // 需配置取消
boolean flag = groupManageService.checkCancelCfg(groupId, Constants.IP_OBJ_GROUP_TYPE);
if(flag) { // 需配置更新
serviceGroupIds += ","+groupId;
}else {
groupIds += ","+groupId;
}
}else { // 需配置更新
groupIds += ","+groupId;
}
}
// 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) {
serviceGroupIds = serviceGroupIds.substring(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
Properties props = groupController.getMsgProp();
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos);
}
}else {
hasData = false;
}
} }
/*
// 配置取消 // 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) { if(StringUtils.isNotBlank(serviceGroupIds)) {
serviceGroupIds = serviceGroupIds.substring(1); serviceGroupIds = serviceGroupIds.substring(1);
@@ -187,7 +240,7 @@ public class IpCommGroupCfgService extends BaseService {
Properties props = groupController.getMsgProp(); Properties props = groupController.getMsgProp();
// 配置未生效 // 配置未生效
/*String updateStatusGroupIds = ""; String updateStatusGroupIds = "";
for (String groupId : serviceGroupIds.split(",")) { for (String groupId : serviceGroupIds.split(",")) {
List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO); List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
if(list.size() > 0) { if(list.size() > 0) {
@@ -205,7 +258,7 @@ public class IpCommGroupCfgService extends BaseService {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE); groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
}*/ }
// 配置已生效× // 配置已生效×
// 组下无域配置common_group_ids -> "",ud_flag -> 0 // 组下无域配置common_group_ids -> "",ud_flag -> 0
@@ -224,12 +277,10 @@ public class IpCommGroupCfgService extends BaseService {
entity.setBatchValidValue("1,0"); entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props); groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
} }
// 配置更新 */
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1); long end = System.currentTimeMillis();
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); logger.warn("IP组域配置批量删除耗时："+(end-start));
transObjGroupToMaat(policyGroupInfos);
}
}else { }else {
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
@@ -241,7 +292,7 @@ public class IpCommGroupCfgService extends BaseService {
} }
} }
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List<BaseIpCfg> cfgs, Map<String, Integer> groupIdMap) { public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List<BaseIpCfg> cfgs, Map<String, Integer> groupIdMap) {
logger.warn("Start to save IP,size:"+cfgs.size()); logger.warn("Start to save IP,size:"+cfgs.size());
long start=System.currentTimeMillis(); long start=System.currentTimeMillis();
@@ -344,5 +395,10 @@ public class IpCommGroupCfgService extends BaseService {
return resultList; return resultList;
} }
private void checkCancelCfg() {
// TODO Auto-generated method stub
}
} }

170
src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java
View File

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.controller.configuration.ObjectGroupController; import com.nis.web.controller.configuration.ObjectGroupController;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
@@ -154,90 +155,95 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(String ids, String groupIds, ScriberIdCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception { public void delete(String ids, String groupIds, ScriberIdCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(ids == null) { if(ids == null) {
groupIds = ""; long start = System.currentTimeMillis();
String cfgIds = "";
String serviceGroupIds = "";
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消 Page<ScriberIdCommCfg> page = new Page<ScriberIdCommCfg>(request, response, "r");
List<ScriberIdCommCfg> set = scriberIdCommGroupDao.getGroupIds(cfg); page.setOrderBy("");
if(set.size() == 0) { // 无可删除配置 page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
return; page.setPageNo(1);
}else { page.setLastPage(false);
for (ScriberIdCommCfg scriberIdCommCfg : set) {
Integer groupId = scriberIdCommCfg.getGroupId(); boolean hasData = true;
cfgIds += ","+scriberIdCommCfg.getCfgId(); while(hasData){
if(!serviceGroupIds.contains(groupId+"")) { page.setPageNo(1);
serviceGroupIds += ","+groupId; page.setLastPage(false);
} cfg.setIsValid(null);
}
cfgIds = cfgIds.substring(1); List<ScriberIdCommCfg> list = this.findPage(page, cfg).getList();
serviceGroupIds = serviceGroupIds.substring(1); if(!StringUtil.isEmpty(list)) {
} groupIds = "";
scriberIdCommGroupDao.delete(cfgIds); String cfgIds = "";
String serviceGroupIds = "";
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = ""; for (ScriberIdCommCfg scriberIdCommCfg : list) {
for (String groupId : strings) { Integer groupId = scriberIdCommCfg.getGroupId();
Integer size = scriberIdCommGroupDao.getCfgInfoByGroupIds(groupId); cfgIds += ","+scriberIdCommCfg.getCfgId();
if(size == 0) { // 需配置取消 if(!serviceGroupIds.contains(groupId+"")) {
serviceGroupIds += ","+groupId; serviceGroupIds += ","+groupId;
}else { // 需配置更新 }
groupIds += ","+groupId; }
} cfgIds = cfgIds.substring(1);
} serviceGroupIds = serviceGroupIds.substring(1);
scriberIdCommGroupDao.delete(cfgIds);
// 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) { // 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消
serviceGroupIds = serviceGroupIds.substring(1); String[] strings = serviceGroupIds.split(",");
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class); serviceGroupIds = "";
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r"); for (String groupId : strings) {
Properties props = groupController.getMsgProp(); Integer size = scriberIdCommGroupDao.getCfgInfoByGroupIds(groupId);
if(size == 0) { // 需配置取消
// 配置未生效 boolean flag = groupManageService.checkCancelCfg(groupId, Constants.SUBID_OBJ_GROUP_TYPE);
/*String updateStatusGroupIds = ""; if(flag) { // 需配置更新
for (String groupId : serviceGroupIds.split(",")) { serviceGroupIds += ","+groupId;
List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO); }else {
if(list.size() > 0) { groupIds += ","+groupId;
updateStatusGroupIds += ","+groupId; }
} }else { // 需配置更新
groupIds += ","+groupId;
}
}
// 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) {
serviceGroupIds = serviceGroupIds.substring(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
Properties props = groupController.getMsgProp();
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos);
}
}else {
hasData = false;
} }
if(StringUtils.isNotBlank(updateStatusGroupIds)) {
updateStatusGroupIds = updateStatusGroupIds.substring(1); }
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(updateStatusGroupIds); long end = System.currentTimeMillis();
entity.setFunctionId(888); logger.warn("账号组域配置，批量删除耗时："+(end-start));
entity.setCommonGroupIds("");
entity.setIsValid(Constants.VALID_NO);
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
}*/
// 配置已生效×
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
transObjGroupToMaat(policyGroupInfos);
}
}else { }else {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
scriberIdCommGroupDao.delete(ids); scriberIdCommGroupDao.delete(ids);

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

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.StringUtils; import com.nis.util.StringUtils;
import com.nis.web.controller.configuration.ObjectGroupController; import com.nis.web.controller.configuration.ObjectGroupController;
import com.nis.web.dao.CrudDao; import com.nis.web.dao.CrudDao;
@@ -154,89 +155,92 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(String ids, String groupIds, UrlCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception { public void delete(String ids, String groupIds, UrlCommCfg cfg, HttpServletRequest request, HttpServletResponse response) throws Exception {
if(ids == null) { if(ids == null) {
groupIds = ""; long start = System.currentTimeMillis();
String cfgIds = "";
String serviceGroupIds = "";
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消
List<UrlCommCfg> set = urlCommGroupDao.getGroupIds(cfg);
if(set.size() == 0) { // 无可删除配置
return;
}else {
for (UrlCommCfg urlCommCfg : set) {
Integer groupId = urlCommCfg.getGroupId();
cfgIds += ","+urlCommCfg.getCfgId();
if(!serviceGroupIds.contains(groupId+"")) {
serviceGroupIds += ","+groupId;
}
}
cfgIds = cfgIds.substring(1);
serviceGroupIds = serviceGroupIds.substring(1);
}
urlCommGroupDao.delete(cfgIds);
String[] strings = serviceGroupIds.split(","); Page<UrlCommCfg> page = new Page<UrlCommCfg>(request, response, "r");
serviceGroupIds = ""; page.setOrderBy("");
for (String groupId : strings) { page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
Integer size = urlCommGroupDao.getCfgInfoByGroupIds(groupId); page.setPageNo(1);
if(size == 0) { // 需配置取消 page.setLastPage(false);
serviceGroupIds += ","+groupId;
}else { // 需配置更新
groupIds += ","+groupId;
}
}
// 配置取消 boolean hasData = true;
if(StringUtils.isNotBlank(serviceGroupIds)) { while(hasData){
serviceGroupIds = serviceGroupIds.substring(1); page.setPageNo(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class); page.setLastPage(false);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r"); cfg.setIsValid(null);
Properties props = groupController.getMsgProp();
List<UrlCommCfg> list = this.findPage(page, cfg).getList();
// 配置未生效 if(!StringUtil.isEmpty(list)) {
/*String updateStatusGroupIds = ""; groupIds = "";
for (String groupId : serviceGroupIds.split(",")) { String cfgIds = "";
List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO); String serviceGroupIds = "";
if(list.size() > 0) {
updateStatusGroupIds += ","+groupId; for (UrlCommCfg urlCommCfg : list) {
} Integer groupId = urlCommCfg.getGroupId();
cfgIds += ","+urlCommCfg.getCfgId();
if(!serviceGroupIds.contains(groupId+"")) {
serviceGroupIds += ","+groupId;
}
}
cfgIds = cfgIds.substring(1);
serviceGroupIds = serviceGroupIds.substring(1);
urlCommGroupDao.delete(cfgIds);
// 删除操作后获取 ①需配置更新的分组（存在域配置）②需配置取消的分组（无域配置） -> 配置分别操作更新或取消
String[] strings = serviceGroupIds.split(",");
serviceGroupIds = "";
for (String groupId : strings) {
Integer size = urlCommGroupDao.getCfgInfoByGroupIds(groupId);
if(size == 0) { // 需配置取消
boolean flag = groupManageService.checkCancelCfg(groupId, Constants.URL_OBJ_GROUP_TYPE);
if(flag) { // 需配置更新
serviceGroupIds += ","+groupId;
}else {
groupIds += ","+groupId;
}
}else { // 需配置更新
groupIds += ","+groupId;
}
}
// 配置取消
if(StringUtils.isNotBlank(serviceGroupIds)) {
serviceGroupIds = serviceGroupIds.substring(1);
ObjectGroupController groupController = SpringContextHolder.getBean(ObjectGroupController.class);
Page<CfgIndexInfo> auditPage = new Page<CfgIndexInfo>(request,response,"r");
Properties props = groupController.getMsgProp();
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
transObjGroupToMaat(policyGroupInfos);
}
}else {
hasData = false;
} }
if(StringUtils.isNotBlank(updateStatusGroupIds)) { }
updateStatusGroupIds = updateStatusGroupIds.substring(1);
CfgIndexInfo entity = new CfgIndexInfo(); long end = System.currentTimeMillis();
entity.setUserRegion5(updateStatusGroupIds); logger.warn("URL组域配置，批量删除耗时："+(end-start));
entity.setFunctionId(888);
entity.setCommonGroupIds("");
entity.setIsValid(Constants.VALID_NO);
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
}*/
// 配置已生效×
// 组下无域配置common_group_ids -> "",ud_flag -> 0
CfgIndexInfo entity = new CfgIndexInfo();
entity.setUserRegion5(serviceGroupIds);
entity.setFunctionId(888);
entity.setCommonGroupIds("");
commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
entity.setServiceId(0);
entity.setIsValid(Constants.VALID_NO);
entity.setIsAudit(Constants.AUDIT_NOT_YES);
entity.setBatchAuditValue("1");
entity.setBatchValidValue("1,0");
groupController.auditAll(auditPage, Constants.AUDIT_NOT_YES, entity, props);
}
// 配置更新
if(StringUtils.isNotBlank(groupIds)) {
groupIds = groupIds.substring(1);
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
transObjGroupToMaat(policyGroupInfos);
}
}else { }else {
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds); List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);