diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index fc79843f1..295310b4a 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3378,6 +3378,12 @@ public class BaseController { if(regionDict.getDictId().intValue()==12||regionDict.getDictId().intValue()==13||regionDict.getDictId().intValue()==601||regionDict.getDictId().intValue()==602) { websiteCfgService.saveHttpBodyCfg(stringCfgs); } + if(regionDict.getDictId().intValue()==25){ + avContentCfgService.saveContUrlCfg(stringCfgs); + } + if(regionDict.getDictId().intValue()==16){ + avContentCfgService.saveVoIpAccountCfg(stringCfgs); + } } else if (regionDict.getRegionType().equals(3)) { for (ComplexkeywordCfg cfg : complexkeywordCfgs) { cfg.setAction(serviceDict.getAction()); diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java index 47cf0fac4..b79cdbef5 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java @@ -29,11 +29,13 @@ public interface AvContentCfgDao { public List getAvContUrlList(CfgIndexInfo entity); public void saveAvContUrlCfg(CfgIndexInfo entity); + public void saveAvContUrlCfgNew(AvContUrlCfg entity); public void deleteAvContUrlCfg(CfgIndexInfo entity); public void insertCfgIndexInfo(CfgIndexInfo entity); public void insertAvVoipIp(CfgIndexInfo entity); public void insertAvVoipAccountCfg(CfgIndexInfo entity); + public void saveAvVoipAccountCfg(AvVoipAccountCfg entity); public void insertAvVoipKeywordCfg(CfgIndexInfo entity); public void updateCfgIndexInfo(CfgIndexInfo entity); diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml index 266a37ecc..8f18ded4c 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -682,6 +682,66 @@ #{doLog,jdbcType=INTEGER} ) + + + SELECT LAST_INSERT_ID() + + insert into av_cont_url_cfg ( + CFG_DESC, + ACTION, + IS_VALID, + IS_AUDIT, + CREATOR_ID, + CREATE_TIME, + EDITOR_ID, + EDIT_TIME, + AUDITOR_ID, + AUDIT_TIME, + SERVICE_ID, + REQUEST_ID, + COMPILE_ID, + IS_AREA_EFFECTIVE, + CLASSIFY, + ATTRIBUTE, + LABLE, + AREA_EFFECTIVE_IDS, + function_id, + cfg_keywords, + cfg_type, + cfg_region_code, + expr_type, + match_method, + is_hexbin, + do_log + )values ( + #{cfgDesc,jdbcType=VARCHAR}, + #{action,jdbcType=INTEGER}, + 0, + 0, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, + #{editorId,jdbcType=INTEGER}, + #{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER}, + #{auditTime,jdbcType=TIMESTAMP}, + #{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER}, + #{compileId,jdbcType=INTEGER}, + #{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR}, + #{attribute,jdbcType=VARCHAR}, + #{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR}, + #{functionId,jdbcType=INTEGER}, + #{cfgKeywords,jdbcType=VARCHAR}, + #{cfgType,jdbcType=VARCHAR}, + #{cfgRegionCode,jdbcType=INTEGER}, + #{exprType,jdbcType=INTEGER}, + #{matchMethod,jdbcType=INTEGER}, + #{isHexbin,jdbcType=INTEGER}, + #{doLog,jdbcType=INTEGER} + ) + @@ -853,6 +913,61 @@ #{voipAccount.isHexbin,jdbcType=INTEGER} ) + + insert into av_voip_account_cfg ( + CFG_DESC, + ACTION, + IS_VALID, + IS_AUDIT, + CREATOR_ID, + CREATE_TIME, + EDITOR_ID, + EDIT_TIME, + AUDITOR_ID, + AUDIT_TIME, + SERVICE_ID, + REQUEST_ID, + COMPILE_ID, + IS_AREA_EFFECTIVE, + CLASSIFY, + ATTRIBUTE, + LABLE, + AREA_EFFECTIVE_IDS, + function_id, + cfg_keywords, + cfg_type, + cfg_region_code, + expr_type, + match_method, + is_hexbin + )values ( + #{cfgDesc,jdbcType=VARCHAR}, + #{action,jdbcType=INTEGER}, + 0, + 0, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, + #{editorId,jdbcType=INTEGER}, + #{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER}, + #{auditTime,jdbcType=TIMESTAMP}, + #{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER}, + #{compileId,jdbcType=INTEGER}, + #{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR}, + #{attribute,jdbcType=VARCHAR}, + #{lable,jdbcType=VARCHAR}, + #{areaEffectiveIds,jdbcType=VARCHAR}, + #{functionId,jdbcType=INTEGER}, + #{cfgKeywords,jdbcType=VARCHAR}, + #{cfgType,jdbcType=VARCHAR}, + #{cfgRegionCode,jdbcType=INTEGER}, + #{exprType,jdbcType=INTEGER}, + #{matchMethod,jdbcType=INTEGER}, + #{isHexbin,jdbcType=INTEGER} + ) + insert into ntc_subscribe_id_cfg ( 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 f877dcd8a..4a6bac637 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -183,7 +183,14 @@ public class AvContentCfgService extends BaseService{ return cfg; }*/ - + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void saveVoIpAccountCfg(List> cfgs) { + for (BaseStringCfg voipAccount : cfgs) { + AvVoipAccountCfg cfg=new AvVoipAccountCfg(); + BeanUtils.copyProperties(voipAccount, cfg); + avContentCfgDao.saveAvVoipAccountCfg(cfg); + } + } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdateAvVoip(CfgIndexInfo entity){ //设置区域运营商信息 @@ -1401,6 +1408,14 @@ public class AvContentCfgService extends BaseService{ return cfg; } @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void saveContUrlCfg(List> cfgs){ + for(BaseStringCfg cfg : cfgs){ + AvContUrlCfg _cfg=new AvContUrlCfg(); + BeanUtils.copyProperties(cfg, _cfg); + avContentCfgDao.saveAvContUrlCfgNew(_cfg); + } + } + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdateContUrl(CfgIndexInfo entity){ //设置区域运营商信息 setAreaEffectiveIds(entity); diff --git a/src/main/resources/sql/20181030/update_region.sql b/src/main/resources/sql/20181030/update_region.sql index 720f62ba5..1f19ba3fd 100644 --- a/src/main/resources/sql/20181030/update_region.sql +++ b/src/main/resources/sql/20181030/update_region.sql @@ -15,4 +15,6 @@ UPDATE function_region_dict SET is_import=1 WHERE function_id=37 AND dict_id=599 UPDATE function_region_dict SET is_import=0 WHERE function_id=37 AND dict_id=600; #http 高级 -UPDATE function_region_dict SET is_import=1 WHERE function_id=8 AND dict_id IN(9,10,11,12,13); \ No newline at end of file +UPDATE function_region_dict SET is_import=1 WHERE function_id=8 AND dict_id IN(9,10,11,12,13); +#流媒体 +UPDATE function_region_dict SET is_import=1 WHERE function_id=22 AND dict_id IN(25,597); \ No newline at end of file