diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index ad859578c..71852c1fb 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -1431,9 +1431,9 @@ public class AppCfgService extends BaseService { } public void updateAppPolicyCfgValid(Integer isValid, String ids, Integer functionId) { - AppPolicyCfg entity = new AppPolicyCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppPolicyCfg entity = new AppPolicyCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1469,9 +1469,9 @@ public class AppCfgService extends BaseService { } public void updateAppIpCfgValid(Integer isValid, String ids, Integer functionId) { - AppIpCfg entity = new AppIpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppIpCfg entity = new AppIpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1492,9 +1492,9 @@ public class AppCfgService extends BaseService { } public void updateAppTcpCfgValid(Integer isValid, String ids, Integer functionId) { - AppTcpCfg entity = new AppTcpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppTcpCfg entity = new AppTcpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1515,9 +1515,9 @@ public class AppCfgService extends BaseService { } public void updateAppHttpCfgValid(Integer isValid, String ids, Integer functionId) { - AppHttpCfg entity = new AppHttpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppHttpCfg entity = new AppHttpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1538,9 +1538,9 @@ public class AppCfgService extends BaseService { } public void updateAppDomainCfgValid(Integer isValid, String ids, Integer functionId) { - AppDomainCfg entity = new AppDomainCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppDomainCfg entity = new AppDomainCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1562,9 +1562,9 @@ public class AppCfgService extends BaseService { // 主题网站配置删除 public void updateAppTopicDomainCfgValid(Integer isValid, String ids, Integer functionId) { - AppTopicDomainCfg entity = new AppTopicDomainCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppTopicDomainCfg entity = new AppTopicDomainCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1585,9 +1585,9 @@ public class AppCfgService extends BaseService { } public void updateAppByteCfgValid(Integer isValid, String ids, Integer functionId) { - AppByteCfg entity = new AppByteCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppByteCfg entity = new AppByteCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1608,9 +1608,9 @@ public class AppCfgService extends BaseService { } public void updateAppSslCfgValid(Integer isValid, String ids, Integer functionId) { - AppSslCertCfg entity = new AppSslCertCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppSslCertCfg entity = new AppSslCertCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1631,9 +1631,9 @@ public class AppCfgService extends BaseService { } public void updateAppHeaderCfgValid(Integer isValid, String ids, Integer functionId) { - AppHeaderCfg entity = new AppHeaderCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppHeaderCfg entity = new AppHeaderCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 1bde1abd0..da56e65b6 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -290,9 +290,9 @@ public class AvCfgService extends BaseService{ audioAuditAvSignSample(entity,1); } public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){ - AvFileSampleCfg entity = new AvFileSampleCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + AvFileSampleCfg entity = new AvFileSampleCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -332,9 +332,9 @@ public class AvCfgService extends BaseService{ } } public void updateAvSignSampleValid(Integer isAudit,Integer isValid,String ids){ - AvSignSampleCfg entity = new AvSignSampleCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + AvSignSampleCfg entity = new AvSignSampleCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsAudit(isAudit); entity.setIsValid(isValid); diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index dc1b5d1d3..807a9526b 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -322,9 +322,9 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateAvVoipValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = compileIds.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -347,9 +347,9 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateAvVoipAccountValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = compileIds.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -744,10 +744,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseIpCfg entity = new BaseIpCfg(); - entity.setTableName("av_cont_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseIpCfg entity = new BaseIpCfg(); + entity.setTableName("av_cont_ip_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1024,10 +1024,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updatePicIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseIpCfg entity = new BaseIpCfg(); - entity.setTableName("av_pic_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseIpCfg entity = new BaseIpCfg(); + entity.setTableName("av_pic_ip_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1280,10 +1280,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseStringCfg entity = new BaseStringCfg(); - entity.setTableName("av_cont_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseStringCfg entity = new BaseStringCfg(); + entity.setTableName("av_cont_url_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1525,10 +1525,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updatePicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseStringCfg entity = new BaseStringCfg(); - entity.setTableName("av_pic_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseStringCfg entity = new BaseStringCfg(); + entity.setTableName("av_pic_url_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java index 64962d269..5cc472225 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -213,9 +213,9 @@ public class BgpCfgService extends CrudService { * @param functionId */ public void updateBgpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java index b664160e1..0a6bfe591 100644 --- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java @@ -89,9 +89,9 @@ public class DdosCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DdosIpCfg entity = new DdosIpCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + DdosIpCfg entity = new DdosIpCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index 59c6889b3..657ce65d2 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -89,9 +89,9 @@ public class DnsIpCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DnsIpCfg entity = new DnsIpCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + DnsIpCfg entity = new DnsIpCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java index 9992bead6..d68664a77 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java @@ -103,9 +103,9 @@ public class DnsResStrategyService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DnsResStrategy entity = new DnsResStrategy(); String[] idArray = ids.split(","); for(String id :idArray){ + DnsResStrategy entity = new DnsResStrategy(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index eff62180b..11a8bc8ef 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -511,9 +511,9 @@ public class DomainService extends CrudService { } } public void updateDomainCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 3e22080c4..5004caeb5 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -197,9 +197,9 @@ public class FileTransferCfgService extends CrudService0){ + IpPortCfg ipport=entity.getIpPortList().get(0); + ipport.setUserRegion1(StringUtil.isEmpty(ipport.getUserRegion1()) ? "":ipport.getUserRegion1()); + userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+ipport.getUserRegion1(); + } + //存在hash域 + if(entity != null && entity.getP2pHashList() != null && entity.getP2pHashList().size() >0){ + BaseStringCfg hashCfg=entity.getP2pHashList().get(0); + hashCfg.setUserRegion1(StringUtil.isEmpty(hashCfg.getUserRegion1()) ? "":hashCfg.getUserRegion1()); + if(!StringUtil.isEmpty(userRegion)){ + userRegion =userRegion+Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1(); + }else{ + userRegion += Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1(); } } - maatCfg.setUserRegion(userRegion); - + if(!StringUtil.isEmpty(userRegion)){ + maatCfg.setUserRegion(userRegion); + } configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); maatBean.setAuditTime(entity.getAuditTime()); diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 5625b6ea8..dec5bac11 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -234,9 +234,9 @@ public class HttpRedirectCfgService extends CrudService * @param functionId */ public void updatInterceptValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 9ac778361..ce6b5a896 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -181,9 +181,9 @@ public class IpCfgService extends CrudService { } } public void updateIpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java index c327ba5d7..2790e6c2c 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java @@ -103,9 +103,9 @@ public class IpMultiplexPoolCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java index 6d359fe36..e5dcc8427 100644 --- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java @@ -212,9 +212,9 @@ public class MailCfgService extends CrudService { } } public void updateMailCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java index 0e1a8c394..978be4016 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java @@ -101,9 +101,9 @@ public class PxyObjKeyringService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - PxyObjKeyring entity = new PxyObjKeyring(); String[] idArray = ids.split(","); for(String id :idArray){ + PxyObjKeyring entity = new PxyObjKeyring(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index 79e27c9bd..d5c0e38b4 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -257,9 +257,9 @@ public class WebsiteCfgService extends CrudService { } } public void updateHttpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -604,9 +604,9 @@ public class WebsiteCfgService extends CrudService { } } public void updateSslCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -875,9 +875,9 @@ public class WebsiteCfgService extends CrudService { * @param functionId */ public void updateDnsCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java index 9be0fc237..8676fa3da 100644 --- a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java @@ -151,9 +151,9 @@ public class XmppCfgService extends CrudService { } } public void updateXmppCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId());