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

group添加默认空的选项，列表与导出添加协议

Browse Source
This commit is contained in:
wangxin
2019-06-25 14:34:10 +08:00
parent 98477b8e08
commit 28c9d6d107
5 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -209,7 +209,10 @@ public class ObjectGroupService extends BaseService {
}else{
if(StringUtils.isNotBlank(e.getValue().toString())){
String val=e.getValue().toString().substring(0,e.getValue().toString().length()-1);
canceledGroup.append(val);
if(StringUtils.isNotBlank(val)){
canceledGroup.append(val);
}
}
}
}
@@ -219,20 +222,32 @@ public class ObjectGroupService extends BaseService {
for(Object val:newMap.values()){
String _val=(String)val;
if(StringUtils.isNotBlank(_val)){
if(_val.startsWith(",")){
if(_val.startsWith(",")&&!",".equals(_val.trim())){
okGroup.append(_val.substring(1));
}else{
}else if(StringUtils.isNotBlank(_val)){
okGroup.append(_val);
}
}
}
//取消勾选的组更新UD_FLAG
if(StringUtils.isNotBlank(canceledGroup.toString())){
policyGroupInfoDao.updateUdFlag(canceledGroup.toString().substring(1),1,null);
if(canceledGroup.toString().startsWith(",")){
canceledGroup.deleteCharAt(0);
}
if(canceledGroup.toString().endsWith(",")){
canceledGroup.deleteCharAt(canceledGroup.toString().length()-1);
}
policyGroupInfoDao.updateUdFlag(canceledGroup.toString(),1,null);
}
//新选择的组更新UD_FALG
if(StringUtils.isNotBlank(okGroup.toString())){
okGroup.deleteCharAt(okGroup.toString().length()-1);
if(okGroup.toString().startsWith(",")){
okGroup.deleteCharAt(0);
}
if(okGroup.toString().endsWith(",")){
okGroup.deleteCharAt(okGroup.toString().length()-1);
}
policyGroupInfoDao.updateUdFlag(okGroup.toString(),2,null);
}
}else if(MapUtils.isNotEmpty(entity.getUserRegion())){
@@ -545,9 +560,9 @@ public class ObjectGroupService extends BaseService {
StringBuffer buf=new StringBuffer();
for(Object val:dataMap.values()){
String _val=(String)val;
if(_val.startsWith(",")){
if(_val.startsWith(",")&&!",".equals(_val)){
buf.append(_val.substring(1));
}else{
}else if(StringUtils.isNotBlank(_val)){
buf.append(_val);
}
}
@@ -577,6 +592,13 @@ public class ObjectGroupService extends BaseService {
c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode()));
}
}
if(c.getUserRegion1().equalsIgnoreCase("https")){
c.setUserRegion1("HTTPS");
}else if(c.getUserRegion1().equalsIgnoreCase("http")){
c.setUserRegion1("HTTP");
}else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
c.setUserRegion1("Intercept");
}
}
if(StringUtils.isNotBlank(groupIds.toString())){
groupIds.deleteCharAt(groupIds.toString().length()-1);
@@ -639,6 +661,13 @@ public class ObjectGroupService extends BaseService {
c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode()));
}
}
if(c.getUserRegion1().equalsIgnoreCase("https")){
c.setUserRegion1("HTTPS");
}else if(c.getUserRegion1().equalsIgnoreCase("http")){
c.setUserRegion1("HTTP");
}else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
c.setUserRegion1("Intercept");
}
}
if(StringUtils.isNotBlank(groupIds.toString())){
groupIds.deleteCharAt(groupIds.toString().length()-1);