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

配置界面的Cfg Id检索条件 增加范围和in的检索方式的功能修改

Browse Source
This commit is contained in:
shangguanyanfei
2019-04-11 17:13:44 +08:00
parent fc08261929
commit 268a0ae81b
26 changed files with 276 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -88,29 +88,6 @@ public class AppCfgService extends BaseService {
protected AsnIpCfgDao asnIpCfgDao;
public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page);
List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
@@ -125,29 +102,6 @@ public class AppCfgService extends BaseService {
public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page);
List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
@@ -178,29 +132,6 @@ public class AppCfgService extends BaseService {
}
public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page);
List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
@@ -225,29 +156,6 @@ public class AppCfgService extends BaseService {
// 主题网站列表
public Page<AppTopicDomainCfg> findAppTopicDomainList(Page<AppTopicDomainCfg> page, AppTopicDomainCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page);
List<AppTopicDomainCfg> list = appCfgDao.findAppTopicDomainList(entity);
@@ -272,29 +180,6 @@ public class AppCfgService extends BaseService {
}
public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
//配置ID 查询条件 查询范围的处理
String compileIdNew =entity.getCompileIdNew();
if(!StringUtil.isEmpty(compileIdNew)){
if(compileIdNew.indexOf("-")!=-1){//包含
String[] split = compileIdNew.split("-");
if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
entity.setCompileIdStart(Integer.parseInt(split[0]));
entity.setCompileIdEnd(Integer.parseInt(split[1]));
}else{
entity.setCompileIdStart(Integer.parseInt(split[1]));
entity.setCompileIdEnd(Integer.parseInt(split[0]));
}
}else if(compileIdNew.indexOf(",")!=-1){
String[] split = compileIdNew.split(",");
List<String> idList=new ArrayList<String>();
for (int i = 0; i < split.length; i++) {
idList.add(split[i]);
}
entity.setCompileIdNewList(idList);
}else{
entity.setCompileId(Integer.parseInt(compileIdNew));
}
}
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
entity.setPage(page);
List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);