From 97a06a98742edfb436e73224dfcff41b83e04e63 Mon Sep 17 00:00:00 2001 From: leijun Date: Thu, 11 Oct 2018 18:33:23 +0800 Subject: [PATCH] =?UTF-8?q?VoIP=20ip=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ntc/AvContentController.java | 20 ++- .../dao/configuration/AvContentCfgDao.java | 8 +- .../web/dao/configuration/AvContentCfgDao.xml | 164 +++++++++++++++++- .../configuration/AvContentCfgService.java | 52 ++++-- .../sql/20181010/update_media_region.sql | 19 ++ .../WEB-INF/views/cfg/av/voip/voipForm.jsp | 6 +- .../WEB-INF/views/cfg/av/voip/voipSubList.jsp | 2 +- 7 files changed, 250 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/sql/20181010/update_media_region.sql diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java index 5f5a86ee5..6d7200c89 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java @@ -26,6 +26,7 @@ import com.nis.domain.configuration.AreaBean; import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.AvVoipAccountCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.exceptions.MaatConvertException; import com.nis.domain.configuration.AvVoipIpCfg; @@ -124,8 +125,8 @@ public class AvContentController extends BaseController { @RequestMapping(value = {"/voipList"}) public String voipCfgList(Model model,HttpServletRequest request ,HttpServletResponse response ,@ModelAttribute("cfg")CfgIndexInfo entity ,RedirectAttributes redirectAttributes){ - if(entity.getVoipIp()== null){ - entity.setVoipIp(new AvVoipIpCfg()); + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); } if(entity.getVoipAccount()== null){ entity.setVoipAccount(new AvVoipAccountCfg()); @@ -283,7 +284,7 @@ public class AvContentController extends BaseController { CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo); List tabList = new ArrayList(); //获取voipIpCfg信息 - if(cfg.getVoipIps()!=null){ +/* if(cfg.getVoipIps()!=null){ String cfgType = null; for(AvVoipIpCfg ip:cfg.getVoipIps()){ if(!ip.getCfgType().equals(cfgType)){ @@ -291,7 +292,17 @@ public class AvContentController extends BaseController { cfgType = ip.getCfgType(); } } + }*/ + if(cfg.getIpPortList()!=null){ + String cfgType = null; + for(IpPortCfg ip:cfg.getIpPortList()){ + if(!ip.getCfgType().equals(cfgType)){ + tabList.add(new String[]{"1",ip.getCfgType()}); + cfgType = ip.getCfgType(); + } + } } + if(cfg.getVoipAccounts()!=null){ String cfgType = null; for(AvVoipAccountCfg account:cfg.getVoipAccounts()){ @@ -536,6 +547,9 @@ public class AvContentController extends BaseController { ,HttpServletResponse response ,@ModelAttribute("cfg")BaseStringCfg entity ,RedirectAttributes redirectAttributes){ + if(entity.getIpPort()== null){ + entity.setIpPort(new IpPortCfg()); + } Page page = avContentCfgService.findContUrlPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model,entity); 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 b4c568a31..ec1b84cd6 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java @@ -6,9 +6,11 @@ import java.util.List; import com.nis.domain.configuration.AvVoipAccountCfg; import com.nis.domain.configuration.AvVoipIpCfg; +import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.IpPortCfg; import com.nis.web.dao.MyBatisDao; @@ -20,6 +22,10 @@ public interface AvContentCfgDao { public List findVoipAccountCfgList(CfgIndexInfo entity); public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity); + public List getIpPortList(CfgIndexInfo entity); + public void saveIpPortCfg(IpPortCfg entity); + public void deleteIpCfg(CfgIndexInfo entity); + public void insertCfgIndexInfo(CfgIndexInfo entity); public void insertAvVoipIp(CfgIndexInfo entity); public void insertAvVoipAccountCfg(CfgIndexInfo entity); @@ -38,7 +44,7 @@ public interface AvContentCfgDao { public void updateIp(BaseIpCfg entity); public List findIpList(BaseIpCfg entity) ; public List getIpList(BaseIpCfg entity) ; - + public void updateCfgValid(BaseCfg entity); public BaseStringCfg findStringCfgById(BaseStringCfg entity) ; public void insertString(BaseStringCfg entity); public void updateString(BaseStringCfg 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 ceb889982..e9ad54c57 100644 --- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml @@ -155,7 +155,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port + ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address + ,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id + ,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id, + a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable + ,a.area_effective_ids,a.function_id,a.cfg_region_code + r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT, r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, @@ -190,6 +231,12 @@ r.audit_time,r.service_id,r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable, r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log + + @@ -1734,4 +1878,18 @@ + + update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER}, + editor_id = #{editorId,jdbcType=INTEGER} , + edit_time = #{editTime,jdbcType=TIMESTAMP} + + + AND cfg_id = #{cfgId,jdbcType=BIGINT} + + + AND compile_id = #{compileId,jdbcType=INTEGER} + + and function_id=#{functionId,jdbcType=INTEGER} + + \ No newline at end of file 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 dbd11cde5..7e8689ed8 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -117,12 +117,13 @@ public class AvContentCfgService extends BaseService{ public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) { CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity); List ntcSubscribeList=getSubscribeIdCfgList(cfg); - List voipIps=getVoipIpCfgList(cfg); + //List voipIps=getVoipIpCfgList(cfg); + List ipPortList = avContentCfgDao.getIpPortList(cfg); List voipAccounts=getVoipAccountCfgList(cfg); cfg.setNtcSubscribeIdCfgList(ntcSubscribeList); - cfg.setVoipIps(voipIps); + //cfg.setVoipIps(voipIps); cfg.setVoipAccounts(voipAccounts); - + cfg.setIpPortList(ipPortList); return cfg; } /* public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) { @@ -160,11 +161,17 @@ public class AvContentCfgService extends BaseService{ entity.setCreateTime(new Date()); entity.setCreatorId(entity.getCurrentUser().getId()); avContentCfgDao.insertCfgIndexInfo(entity); - if(entity.getVoipIps()!=null){ +/* if(entity.getVoipIps()!=null){ for (AvVoipIpCfg voipIp : entity.getVoipIps()) { entity.setVoipIp(voipIp); avContentCfgDao.insertAvVoipIp(entity); } + }*/ + if(entity.getIpPortList()!=null){ + for(IpPortCfg cfg:entity.getIpPortList()){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + avContentCfgDao.saveIpPortCfg(cfg); + } } if(entity.getNtcSubscribeIdCfgList()!=null){ for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ @@ -199,7 +206,8 @@ public class AvContentCfgService extends BaseService{ entity.setEditorId(entity.getCurrentUser().getId()); avContentCfgDao.updateCfgIndexInfo(entity); //无效子配置后，再新增子配置 - avContentCfgDao.deleteAvVoipIp(entity); + //avContentCfgDao.deleteAvVoipIp(entity); + avContentCfgDao.deleteIpCfg(entity); stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity); avContentCfgDao.deleteAvVoipAccountCfg(entity); AreaIpCfg area = new AreaIpCfg(); @@ -208,11 +216,17 @@ public class AvContentCfgService extends BaseService{ areaIpCfgDao.deleteAreaIpCfg(area); entity.setCreateTime(new Date()); entity.setCreatorId(entity.getCurrentUser().getId()); - if(entity.getVoipIps()!=null&&entity.getVoipIps().size()>0){ + /*if(entity.getVoipIps()!=null&&entity.getVoipIps().size()>0){ for (AvVoipIpCfg voipIp : entity.getVoipIps()) { entity.setVoipIp(voipIp); avContentCfgDao.insertAvVoipIp(entity); } + }*/ + if(entity.getIpPortList()!=null){ + for(IpPortCfg cfg:entity.getIpPortList()){ + BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); + avContentCfgDao.saveIpPortCfg(cfg); + } } if(entity.getNtcSubscribeIdCfgList()!=null){ for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ @@ -340,7 +354,13 @@ public class AvContentCfgService extends BaseService{ entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); entity.setEditTime(new Date()); - avContentCfgDao.updateAvVoipIp(entity); + //avContentCfgDao.updateAvVoipIp(entity); + if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){ + IpPortCfg cfg = new IpPortCfg(); + BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"}); + cfg.setTableName(IpPortCfg.getTablename()); + avContentCfgDao.updateCfgValid(cfg); + } avContentCfgDao.updateAvVoipKeywordCfgt(entity); avContentCfgDao.updateAvVoipAccount(entity); avContentCfgDao.updateCfgIndexInfo(entity); @@ -386,7 +406,8 @@ public class AvContentCfgService extends BaseService{ CfgIndexInfo entity = new CfgIndexInfo(); List list = new ArrayList(); - List voipIpList = new ArrayList(); + //List voipIpList = new ArrayList(); + List ipPortList =new ArrayList(); List ntcList = new ArrayList(); List accountList = new ArrayList(); List areaIpCfgList = new ArrayList(); @@ -409,7 +430,8 @@ public class AvContentCfgService extends BaseService{ BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode","cfgType","cfgId"}); areaIpCfgDao.updateAreaIpCfg(areaIpCfg); - voipIpList=avContentCfgDao.findVoipIpCfgList(entity); + //voipIpList=avContentCfgDao.findVoipIpCfgList(entity); + ipPortList = avContentCfgDao.getIpPortList(entity); accountList=avContentCfgDao.findVoipAccountCfgList(entity); ntcList=stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity); areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId()); @@ -424,11 +446,21 @@ public class AvContentCfgService extends BaseService{ List digestRegionList = new ArrayList(); List areaIpRegionList = new ArrayList(); + if(isAudit==1){ - if(!StringUtil.isEmpty(voipIpList)){ + /* if(!StringUtil.isEmpty(voipIpList)){ Map ipMap = cfgConvert(ipRegionList,voipIpList,1,entity,groupRelationList); groupRelationList=ipMap.get("groupList"); ipRegionList=ipMap.get("dstList"); + }*/ + if(!StringUtil.isEmpty(ipPortList)){ + Map ipMap = cfgConvert(ipRegionList,ipPortList,1,entity,groupRelationList); + groupRelationList=ipMap.get("groupList"); + ipRegionList=ipMap.get("dstList"); + if(ipMap.get("numRegionList")!=null){ + numRegionList.addAll(ipMap.get("numRegionList")); + + } } if(!StringUtil.isEmpty(ntcList)){ diff --git a/src/main/resources/sql/20181010/update_media_region.sql b/src/main/resources/sql/20181010/update_media_region.sql new file mode 100644 index 000000000..3071f9521 --- /dev/null +++ b/src/main/resources/sql/20181010/update_media_region.sql @@ -0,0 +1,19 @@ +#流媒体协议配置 +update function_service_dict set service_id='39',protocol_id='23' where dict_id='30'; +update function_service_dict set service_id='151',protocol_id='23' where dict_id='31'; +#流媒体协议 增加IP配置 +INSERT INTO `function_region_dict` (`function_id`, `config_district`, `config_region_code`, `config_region_value`, `config_desc`, `is_valid`, `is_maat`, `region_type`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `config_service_type`, `config_expr_type`, `config_match_method`, `config_ip_type`, `config_hex`, `config_multi_keywords`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES ('22', '', '1', 'NTC_UNIVERSAL_IP', '流媒体协议 IP配置', '1', '1', '1', NULL, '0000-00-00 00:00:00', NULL, '0000-00-00 00:00:00', '', '', '', '4,6', '', '', '1,2,3', '1,2', '0,1', '0,6,17', '1,2,3,4', '1'); + +#voip配置 +update function_service_dict set service_id='38',protocol_id='22' where dict_id='16'; +update function_service_dict set service_id='150',protocol_id='22' where dict_id='17'; +#voip 配置 +update function_region_dict set config_region_value='NTC_UNIVERSAL_IP' where dict_id='8'; + +#文件摘要配置 +update function_service_dict set service_id='399' where dict_id='59'; +update function_service_dict set service_id='273' where dict_id='60'; + +update function_region_dict set config_region_value ='MM_FILE_DIGEST' where dict_id='50'; +update function_region_dict set is_valid='0' where dict_id='187'; + diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index 6b471a21c..4479d302e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -250,11 +250,11 @@ class="glyphicon glyphicon-plus ${tabName}Add" onClick="addContent(this,'${tabName}')" title="add"> - + <%-- --%> - - + +
<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp index 56f7bcc3a..051c235fc 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp @@ -22,7 +22,7 @@
- +