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-13 20:57:29 +08:00
parent 446c802ece
commit 7501eb4317
31 changed files with 4197 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.nis.web.dao.basics.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,7 +51,8 @@ public class CommonGroupManageService extends BaseService{
private DomainCommGroupDao domainCommGroupDao;
@Autowired
private ScriberIdCommGroupDao scriberIdCommGroupDao;
@Autowired
private PolicyGroupInfoDao policyGroupInfoDao;
public Page<CommonGroupInfo> findCommonGroupInfoList(Page<CommonGroupInfo> page, CommonGroupInfo entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page);
@@ -108,7 +110,8 @@ public class CommonGroupManageService extends BaseService{
}
}
}
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(ids);
transObjGroupToMaat(policyGroupInfos);
}
// 分组配置界面使用
@@ -205,7 +208,7 @@ public class CommonGroupManageService extends BaseService{
/**
* 校验执行删除操作后分组下域配置是否为空
* @param serviceGroupIds
* @param grouIdAndCfgId
* @param groupType
* @return
*/
@@ -225,7 +228,7 @@ public class CommonGroupManageService extends BaseService{
map.put(groupId, list);
}
}
List<Integer> resultList = new ArrayList<Integer>();
for (Integer groupId : map.keySet()) {
List<Integer> cfgIdList = map.get(groupId);
@@ -243,7 +246,7 @@ public class CommonGroupManageService extends BaseService{
}else if(groupType == 9) { // ScriberId
size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), ScriberIdCommCfg.getTablename());
}
if(size == 0) { // 0为分组下的最后一条配置，获取配置ID提示
Integer compileId = commonGroupManageDao.getCompileIdByGroupId(","+groupId+",");
if(compileId != null) {
@@ -253,5 +256,5 @@ public class CommonGroupManageService extends BaseService{
}
return resultList;
}
}

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

@@ -97,7 +97,7 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 8);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
//transObjGroupToMaat(policyGroupInfos);
transObjGroupToMaat(policyGroupInfos);
}
}
@@ -116,12 +116,13 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
domainCommGroupDao.update(entity);
// 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) {
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
groupManageService.updateGroupStatus(policyGroupInfos, 8);
}
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
transObjGroupToMaat(policyGroupInfos);
}
@@ -131,6 +132,7 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
domainCommGroupDao.delete(ids);
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 8);
transObjGroupToMaat(policyGroupInfos);
}
public List<DomainCommCfg> getByIds(String ids) {

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

@@ -75,13 +75,13 @@ public class IpCommGroupCfgService extends BaseService {
public void update(IpCommCfg entity){
ipCommGroupCfgDao.update(entity);
// 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) {
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
groupManageService.updateGroupStatus(policyGroupInfos, 5);
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
}
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
transObjGroupToMaat(policyGroupInfos);
}
@@ -123,7 +123,7 @@ public class IpCommGroupCfgService extends BaseService {
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 5);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
//transObjGroupToMaat(policyGroupInfos);
transObjGroupToMaat(policyGroupInfos);
}
}
@@ -136,7 +136,7 @@ public class IpCommGroupCfgService extends BaseService {
ipCommGroupCfgDao.delete(ids);
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 5);
//transObjGroupToMaat(policyGroupInfos);
transObjGroupToMaat(policyGroupInfos);
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)

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

@@ -97,7 +97,7 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 9);
//TODO 组配置更新时 需检索是否被其它配置引用，若被引用需调用相应服务接口更新配置
//transObjGroupToMaat(policyGroupInfos);
transObjGroupToMaat(policyGroupInfos);
}
}
@@ -117,13 +117,13 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
scriberIdCommGroupDao.update(entity);
// 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) {
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
groupManageService.updateGroupStatus(policyGroupInfos, 9);
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
}
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
transObjGroupToMaat(policyGroupInfos);
}
@@ -133,6 +133,7 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
scriberIdCommGroupDao.delete(ids);
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 9);
transObjGroupToMaat(policyGroupInfos);
}
public List<ScriberIdCommCfg> getByIds(String ids) {

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

@@ -95,7 +95,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
}
// 更新分组状态
groupManageService.updateGroupStatus(policyGroupInfos, 7);
transObjGroupToMaat(policyGroupInfos);
}
}
@@ -114,12 +114,13 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
urlCommGroupDao.update(entity);
// 更新分组状态
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
if(!entity.getUserRegion1().equals(entity.getGroupId().toString())) {
List<PolicyGroupInfo> policyGroupInfos = new ArrayList<PolicyGroupInfo>();
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
groupManageService.updateGroupStatus(policyGroupInfos, 7);
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getUserRegion1()));
}
policyGroupInfos.addAll(policyGroupInfoDao.findPolicyByServiceGroupInfoList(entity.getGroupId().toString()));
transObjGroupToMaat(policyGroupInfos);
}
@@ -129,6 +130,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
// 更新分组状态
List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(groupIds);
groupManageService.updateGroupStatus(policyGroupInfos, 7);
transObjGroupToMaat(policyGroupInfos);
}
public List<UrlCommCfg> getByIds(String ids) {