diff --git a/src/main/java/com/nis/domain/configuration/GroupAreaInfo.java b/src/main/java/com/nis/domain/configuration/GroupAreaInfo.java new file mode 100644 index 000000000..24c3e1697 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/GroupAreaInfo.java @@ -0,0 +1,47 @@ +package com.nis.domain.configuration; + +import java.io.Serializable; +import java.util.Date; + +/** + * 分组地理信息 + */ +public class GroupAreaInfo extends BaseCfg implements Serializable{ + + private static final long serialVersionUID = 3312689200711339511L; + + private Long id; + private Integer groupId; + private Integer areaCode; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public Integer getGroupId() { + return groupId; + } + public void setGroupId(Integer groupId) { + this.groupId = groupId; + } + public Integer getAreaCode() { + return areaCode; + } + public void setAreaCode(Integer areaCode) { + this.areaCode = areaCode; + } + public Date getCreateTime() { + return createTime; + } + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + public Date getEditTime() { + return editTime; + } + public void setEditTime(Date editTime) { + this.editTime = editTime; + } +} diff --git a/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java new file mode 100644 index 000000000..a68aac5fa --- /dev/null +++ b/src/main/java/com/nis/web/controller/configuration/GroupAreaController.java @@ -0,0 +1,89 @@ +package com.nis.web.controller.configuration; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.nis.domain.Page; +import com.nis.domain.basics.PolicyGroupInfo; +import com.nis.domain.configuration.GroupAreaInfo; +import com.nis.util.StringUtil; +import com.nis.web.controller.BaseController; +import com.nis.web.service.configuration.GroupAreaService; + +/** + * 分组地理信息管理 + * + */ +@Controller +@RequestMapping(value = "${adminPath}/cfg/groupArea") +public class GroupAreaController extends BaseController { + + @Autowired + private GroupAreaService groupAreaService; + + @RequestMapping(value = { "/groupAreaList", "" }) + public String policyGroupList(GroupAreaInfo cfg, HttpServletRequest request, HttpServletResponse response, + Model model) { + if (cfg == null)cfg = new GroupAreaInfo(); + Page pageCondition = new Page(request, response, "r"); + Page page = groupAreaService.findGroupAreaInfoList(pageCondition, cfg); + // 获取策略分组信息 + List policyGroups = policyGroupInfoService.findNatPolicyGroups(); + // 获取区域信息 + initFormCondition(model); + model.addAttribute("cfg", cfg); + model.addAttribute("page", page); + model.addAttribute("policyGroups", policyGroups); + return "/cfg/manipulation/ipmulitiplex/groupAreaList"; + } + + @RequestMapping(value={"/groupAreaForm"}) + public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) { + GroupAreaInfo groupArea=new GroupAreaInfo(); + // 获取未使用的策略分组 + List groups = policyGroupInfoService.findNatPolicyGroups(); + groups = groupAreaService.getNotUsedPolicyGroups(groups); + if(!StringUtil.isEmpty(ids)){ + groupArea=groupAreaService.getInfoById(Integer.parseInt(ids)); + groups.add(policyGroupInfoService.getById(groupArea.getGroupId())); + } + // 获取区域信息 + initFormCondition(model); + model.addAttribute("_cfg", groupArea); + model.addAttribute("policyGroups", groups); + return "/cfg/manipulation/ipmulitiplex/groupAreaForm"; + } + + @RequestMapping(value = "saveOrUpdate") + public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) { + try { + groupAreaService.saveOrUpdate(cfg); + addMessage(redirectAttributes, "save_success"); + } catch (Exception e) { + logger.error("新增失败",e); + addMessage(redirectAttributes, "save_failed"); + } + return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; + } + + @RequestMapping(value={"delete"}) + public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) { + try { + groupAreaService.deldete(ids,isValid); + addMessage(redirectAttributes, "delete_success"); + } catch (Exception e) { + logger.error("删除失败",e); + addMessage(redirectAttributes, "delete_failed"); + } + return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList"; + } + +} diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 3e864cf23..eb17e8c24 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -293,40 +293,40 @@ public class AvController extends BaseController { } //修改标志样例配置审核状态 - /** - * 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次 - * @param isAudit - * @param isValid - * @param ids - * @param functionId - * @return - */ - @RequestMapping(value = {"/sample/auditAvAudioSignSample"}) - public String auditAvAudioSignSample(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes){ + /** + * 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次 + * @param isAudit + * @param isValid + * @param ids + * @param functionId + * @return + */ + @RequestMapping(value = {"/sample/auditAvAudioSignSample"}) + public String auditAvAudioSignSample(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes){ // avCfgService.auditAvSignSample(isAudit,isValid,ids); - AvSignSampleCfg entity = new AvSignSampleCfg(); - String[] idArray = ids.split(","); - for(String id :idArray){ - entity = avCfgService.getAvSignSampleById(Long.parseLong(id)); - entity.setIsAudit(isAudit); - entity.setIsValid(isValid); - entity.setAuditorId(UserUtils.getUser().getId()); - entity.setAuditTime(new Date()); - try { - avCfgService.audioAuditAvSignSample(entity,isAudit); - }catch(Exception e){ - e.printStackTrace(); - if(e instanceof MaatConvertException) { - logger.info("音视频标识样例配置下发失败："+e.getMessage()); - addMessage(redirectAttributes,e.getMessage()); - }else { - logger.error("auditAvAudioSignSample failed",e); - addMessage(redirectAttributes,"audit_failed"); - } + AvSignSampleCfg entity = new AvSignSampleCfg(); + String[] idArray = ids.split(","); + for(String id :idArray){ + entity = avCfgService.getAvSignSampleById(Long.parseLong(id)); + entity.setIsAudit(isAudit); + entity.setIsValid(isValid); + entity.setAuditorId(UserUtils.getUser().getId()); + entity.setAuditTime(new Date()); + try { + avCfgService.audioAuditAvSignSample(entity,isAudit,false); + }catch(Exception e){ + e.printStackTrace(); + if(e instanceof MaatConvertException) { + logger.info("音视频标识样例配置下发失败："+e.getMessage()); + addMessage(redirectAttributes,e.getMessage()); + }else { + logger.error("auditAvAudioSignSample failed",e); + addMessage(redirectAttributes,"audit_failed"); } } - return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+functionId; } + return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId; + } //修改标志样例配置审核状态 /** * 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次 @@ -340,9 +340,11 @@ public class AvController extends BaseController { public String auditAvSignSample(Integer preset,AvSignSampleCfgModel cfg,Integer functionId,RedirectAttributes redirectAttributes){ //预置配置 try { - if(preset!=null&&1==preset){ - avCfgService.auditAvSignSample(); - addMessage(redirectAttributes,"audit_success"); + if(preset!=null&&1==preset){//预置信息需要在数据库中插入一条记录 + for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) { + avCfgService.saveOrUpdateAvSignSample(avSignSampleCfg); + } + addMessage(redirectAttributes,"save_success"); return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId; } } catch (Exception e1) { @@ -352,15 +354,15 @@ public class AvController extends BaseController { addMessage(redirectAttributes,"request_service_failed"); }else { logger.error("auditAvSignSample failed",e1); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"save_failed"); } } //修改下发配置 if(cfg != null && cfg.getCfgs() != null ){ for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) { - if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){ + /*if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){ avSignSampleCfg.setIsValid(0); - } + }*/ if(cfg.getAction()!=null){ avSignSampleCfg.setAction(cfg.getAction()); } @@ -368,7 +370,7 @@ public class AvController extends BaseController { // if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){ try { avCfgService.auditAvSignSample(avSignSampleCfg); - addMessage(redirectAttributes,"audit_success"); + addMessage(redirectAttributes,"save_success"); }catch(Exception e){ e.printStackTrace(); if(e instanceof MaatConvertException) { @@ -376,7 +378,7 @@ public class AvController extends BaseController { addMessage(redirectAttributes,"request_service_failed"); }else { logger.error("auditAvSignSample failed",e); - addMessage(redirectAttributes,"audit_failed"); + addMessage(redirectAttributes,"save_failed"); } } } diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java index 93144d780..b855bac71 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java @@ -15,5 +15,5 @@ public interface PolicyGroupInfoDao extends CrudDao { List findHasIPPolicyGroupInfosByType(int groupType); List findPolicyGroupInfosHasIpRegionByType(int groupType); PolicyGroupInfo getById(int id); - + List findNatPolicyGroups(); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml index dae3b765b..218d135a8 100644 --- a/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml @@ -67,6 +67,12 @@ FROM policy_group_info r where r.is_valid=1 + + SELECT + + + , s.name as creator_name + ,e.name as editor_name + + FROM group_area_info r + left join sys_user s on r.creator_id=s.id + left join sys_user e on r.editor_id=e.id + + + + AND ${page.where} + + + AND r.group_id =#{groupId } + + + AND r.area_code =#{areaCode } + + AND r.IS_VALID =1 + + AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%') + + + AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%') + + + + + + + ORDER BY ${page.orderBy} + + + ORDER BY r.id desc + + + + + + + + insert into group_area_info( + ID, + GROUP_ID, + AREA_CODE, + IS_VALID, + CREATOR_ID, + CREATE_TIME + )values ( + #{id,jdbcType=INTEGER}, + #{groupId,jdbcType=INTEGER}, + #{areaCode,jdbcType=INTEGER}, + #{isValid,jdbcType=INTEGER}, + #{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP} + ) + + + + update group_area_info + + + + id = #{id,jdbcType=INTEGER}, + + + group_Id = #{groupId,jdbcType=INTEGER}, + + + area_code = #{areaCode,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + + + + and id = #{id,jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java index daf37fcd9..795ec3803 100644 --- a/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java +++ b/src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java @@ -45,6 +45,10 @@ public class PolicyGroupInfoService extends BaseService{ List list=policyGroupInfoDao.findPolicyGroupInfos(); return list; } + public List findNatPolicyGroups() { + List list=policyGroupInfoDao.findNatPolicyGroups(); + return list; + } public List findPolicyGroupInfosByType(int type) { List list=policyGroupInfoDao.findPolicyGroupInfosByType(type); return list; 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 819d30360..c8028a891 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -291,7 +291,7 @@ public class AvCfgService extends BaseService{ entity.setCreateTime(new Date()); //调用服务接口获取compileId Integer compileId = 0; - try { + /*try { List compileIds = ConfigServiceUtil.getId(1,1); if(!StringUtil.isEmpty(compileIds)){ compileId = compileIds.get(0); @@ -300,13 +300,13 @@ public class AvCfgService extends BaseService{ e.printStackTrace(); logger.info("获取编译ID出错"); throw new MaatConvertException(":"+e.getMessage()); - } - if(compileId!=0){ + }*/ +// if(compileId!=0){ entity.setCompileId(compileId); avCfgDao.insertAvSignSample(entity); - }else{ + /*}else{ throw new MaatConvertException(""); - } + }*/ }else{ entity.setEditorId(UserUtils.getUser().getId()); @@ -318,7 +318,7 @@ public class AvCfgService extends BaseService{ //添加即时生效 entity.setIsValid(1); entity.setIsAudit(1); - audioAuditAvSignSample(entity,1); + audioAuditAvSignSample(entity,1,true); } public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){ String[] idArray = ids.split(","); @@ -375,18 +375,28 @@ public class AvCfgService extends BaseService{ } } - public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{ + public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit,boolean init) throws MaatConvertException{ + entity.setAuditTime(new Date()); + entity.setAuditorId(UserUtils.getUser().getId()); avCfgDao.auditAvSignSample(entity); List list = new ArrayList(); if(isAudit==1){ - list.add(entity); - //调用服务接口下发配置数据 - String json=gsonToJson(list); - logger.info("文件样例下发配置参数："+json); - //调用服务接口下发配置 - ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); - logger.info("音视频标志样例配置下发响应信息："+result.getMsg()); - + if(init){//预置配置时初始下发配置 + list.add(entity); + //调用服务接口下发配置数据 + String json=gsonToJson(list); + logger.info("文件样例下发配置参数："+json); + //调用服务接口下发配置 + ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); + logger.info("音视频标志样例配置下发响应信息："+result.getMsg()); + }else{ + list.add(entity); + String json=gsonToJson(list); + logger.info("标志状态变更："+json); + //调用服务接口修改配置内容 + String result = ConfigServiceUtil.patch(json, 2); + logger.info("视频标志样状态变更响应信息："+result); + } }else if(isAudit==3){ AvSignSampleCfg cfg = new AvSignSampleCfg(); cfg.setIsValid(0); @@ -399,78 +409,57 @@ public class AvCfgService extends BaseService{ //调用服务接口取消配置 ToMaatResult result = ConfigServiceUtil.put(json, 2); logger.info("音视频标志样例配置取消配置响应信息："+result.getMsg()); - } - + } } //预置配置下发 - @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void auditAvSignSample() throws MaatConvertException{ - try { - AvSignSampleCfg entity = new AvSignSampleCfg(); - List avSignSampleList = avCfgDao.getAvSignSampleList(entity); - if(avSignSampleList!=null&&avSignSampleList.size()>0){ + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void auditAvSignSample() throws MaatConvertException{ + try { + AvSignSampleCfg entity = new AvSignSampleCfg(); + List avSignSampleList = avCfgDao.getAvSignSampleList(entity); + if(avSignSampleList!=null&&avSignSampleList.size()>0){ // avCfgDao.updateAvSignSampleValid(entity); // avCfgDao.auditAvSignSample(entity); // List list = new ArrayList(); // avSignSampleList.add(entity); - for (AvSignSampleCfg av : avSignSampleList) { - av.setAuditTime(new Date()); - av.setAuditorId(UserUtils.getUser().getId()); - if(av.getIsValid()!=null&&av.getIsValid()!=1){ - av.setIsValid(1); - } - avCfgDao.updateAvSignSampleValid(av); + for (AvSignSampleCfg av : avSignSampleList) { + av.setAuditTime(new Date()); + av.setAuditorId(UserUtils.getUser().getId()); + if(av.getIsValid()!=null&&av.getIsValid()!=1){ + av.setIsValid(1); } - //调用服务接口取消配置 - String json=gsonToJson(avSignSampleList); - logger.info("标志状态变更："+json); - //调用服务接口取消配置 - ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); - logger.info("音视频标志样状态变更响应信息："+result.getMsg()); - }else{ - logger.info("视频场景预置失败，数据为空"); - throw new MaatConvertException(""); + avCfgDao.updateAvSignSampleValid(av); } - } catch (Exception e) { - e.printStackTrace(); + //调用服务接口取消配置 + String json=gsonToJson(avSignSampleList); + logger.info("标志状态变更："+json); + //调用服务接口取消配置 + ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json); + logger.info("音视频标志样状态变更响应信息："+result.getMsg()); + }else{ logger.info("视频场景预置失败，数据为空"); throw new MaatConvertException(""); } - + } catch (Exception e) { + e.printStackTrace(); + logger.info("视频场景预置失败，数据为空"); + throw new MaatConvertException(""); } - @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{ - List list = new ArrayList(); - entity.setAuditTime(new Date()); - entity.setDescription("0"); - list.add(entity); - try { + + } + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) + public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{ + List list = new ArrayList(); + entity.setEditTime(new Date()); + entity.setDescription("0"); + list.add(entity); + try { avCfgDao.updateAvSignSampleValid(entity); - -// avCfgDao.auditAvSignSample(entity); - //更新配置 - - if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_YES){ - //调用服务接口取消配置 - String json=gsonToJson(list); - logger.info("标志状态变更："+json); - //调用服务接口取消配置 - String result = ConfigServiceUtil.patch(json, 2); - logger.info("视频标志样状态变更响应信息："+result); - } - if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_NO){ - //调用服务接口取消配置 - String json=gsonToJson(list); - logger.info("标志状态变更："+json); - //调用服务接口取消配置 - ToMaatResult result = ConfigServiceUtil.put(json, 2); - logger.info("视频标志样状态变更响应信息："+result.getMsg()); - } - } catch (Exception e) { - e.printStackTrace(); - } - + } catch (Exception e) { + e.printStackTrace(); } + + } /*public void auditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{ avCfgDao.auditAvSignSample(entity); List list = new ArrayList(); diff --git a/src/main/java/com/nis/web/service/configuration/GroupAreaService.java b/src/main/java/com/nis/web/service/configuration/GroupAreaService.java new file mode 100644 index 000000000..021b6d037 --- /dev/null +++ b/src/main/java/com/nis/web/service/configuration/GroupAreaService.java @@ -0,0 +1,83 @@ +package com.nis.web.service.configuration; + +import java.util.Date; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.nis.domain.Page; +import com.nis.domain.basics.PolicyGroupInfo; +import com.nis.domain.configuration.GroupAreaInfo; +import com.nis.util.StringUtil; +import com.nis.web.dao.configuration.GroupAreaDao; +import com.nis.web.security.UserUtils; +import com.nis.web.service.BaseService; + +@Service +public class GroupAreaService extends BaseService{ + + @Autowired + private GroupAreaDao groupAreaDao; + + public Page findGroupAreaInfoList(Page page, GroupAreaInfo entity) { + entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r")); + entity.setPage(page); + List list=groupAreaDao.findGroupAreaInfoList(entity); + page.setList(list); + return page; + } + + public GroupAreaInfo getInfoById(int groupId) { + GroupAreaInfo GroupAreaInfo=groupAreaDao.getInfoById(groupId); + return GroupAreaInfo; + } + + public void saveOrUpdate(GroupAreaInfo entity) { + entity.setIsValid(1); + if(entity.getId()==null){//新增 + Date createTime=new Date(); + entity.setCreatorId(UserUtils.getUser().getId()); + entity.setCreateTime(createTime); + groupAreaDao.insert(entity); + }else{//修改 + Date editTime=new Date(); + entity.setEditorId(UserUtils.getUser().getId()); + entity.setEditTime(editTime); + groupAreaDao.update(entity); + } + + } + + public void deldete(String ids, int isValid) { + if(!StringUtil.isEmpty(ids)){ + GroupAreaInfo entity=new GroupAreaInfo(); + Date editTime=new Date(); + entity.setEditorId(UserUtils.getUser().getId()); + entity.setEditTime(editTime); + entity.setIsValid(isValid); + for (String id : ids.split(",")) { + if(!StringUtil.isEmpty(id)){ + entity.setId(Long.parseLong(id)); + groupAreaDao.update(entity); + } + } + } + } + + // 获取未使用的策略分组 + public List getNotUsedPolicyGroups(List policyGroups) { + List groupAreas=groupAreaDao.findGroupAreaInfoList(new GroupAreaInfo()); + for (GroupAreaInfo groupArea : groupAreas) { + for (int i = 0; i < policyGroups.size(); i++) { + Integer groupId = policyGroups.get(i).getGroupId(); + if(groupArea.getGroupId().equals(groupId)){ + policyGroups.remove(i); + i--; + } + } + } + return policyGroups; + } + +} diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4b5e0d130..d12f3d071 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -85,8 +85,8 @@ ssl_control=SSL ssl_feature_control=SSL Cert Control ssl_sni_control=SSL SNI Control ssl_address_control=SSL IP Control -https_website_content_replace=HTTPS Content Replace -https_website_control=HTTPS Website Replace +HTTP(s)_website_content_replace=HTTPS Website Replace +https_website_control=HTTP(s) Website Replace rtp_ip_control=RTP IP Control mms_ip_control=MMS IP Control rtsp_ip_control=RTSP IP Control @@ -864,9 +864,9 @@ replace_zone=Search in replaced_content=Find http_req_uri=HTTP Request URI http_req_header=HTTP Request Header -http_req_body=HTTP Request Content +http_req_body=HTTP Request Body http_resp_header=HTTP Response Header -http_resp_body=HTTP Response Content +http_resp_body=HTTP Response Body #=============region_value,config form title================= #=============userregions=============== userregion1=Customized Region 1 @@ -950,8 +950,8 @@ domain_monit=Domain Intercepter ip_intercepter_whitelist=IP White List domain_monit_whitelist=Domain White List dns_strategy_reject=DNS Response Strategy Control -proxy_http_req_body_replace=HTTP Request Content Replace -proxy_http_res_body_replace=HTTP Response Content Replace +proxy_http_req_body_replace=HTTP Request Body Replace +proxy_http_res_body_replace=HTTP Response Body Replace dns_fake_ip_reject=DNS Spoofing IP Control app_strategy_reject=APP Strategy Control app_strategy_ratelimit=APP Strategy Ratelimit @@ -1102,8 +1102,8 @@ new=New basic_protocol_business_type=Basic Identify business classification tunnel_behavior_business_type=Behavior Identify business classification app_business_type=Application business classification -pxy_intercept_monit_keyring=Certificate Strategy -intercept_file_strategy=Certificate Strategy +pxy_intercept_monit_keyring=Key Ring +intercept_file_strategy=Key Ring root=Root Certificate intermediate=Intermediate Certificate end_entity=End-entity Certificate @@ -1219,7 +1219,7 @@ NTC_VOIP_ACCOUNT=VoIP Account export_failed=Export Failed user_manage=Client Account Manage ip_reuse_policy_object=IP Reuse Policy Object -area_group_manage=Group Area Manage +area_group_manage=Grouping Area Manage stream_media_protocol=Stream Media Protocol new_link=New Link active_link=Active Link @@ -1245,7 +1245,4 @@ mail_address_whitelist=Mail Address Whitelist mail_address_monit=Mail Address Monit mail_address_reject=Mail Address Reject ipsec_protocol=IPSEC Protocol -intercept_intensity=Intercept Intensity -weak_intensity=Weak -stronger_intensity=Strong -strong_intensity=Stronger +intercept_intensity=Intercept Related Domains diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index d87667c29..374ab5594 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1265,7 +1265,4 @@ mail_address_whitelist=Mail Address Whitelist mail_address_monit=Mail Address Monit mail_address_reject=Mail Address Reject ipsec_protocol=IPSEC Protocol -intercept_intensity=Intercept Intensity -weak_intensity=Weak -stronger_intensity=Strong -strong_intensity=Stronger +intercept_intensity=Intercept Related Domains diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e0e86583d..0ec9b6d62 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1240,7 +1240,4 @@ mail_address_monit=\u90AE\u4EF6\u5730\u5740\u76D1\u6D4B mail_address_reject=\u90AE\u4EF6\u5730\u5740\u7BA1\u63A7 ipsec_protocol=IPSEC\u534F\u8BAE intercept_intensity=\u62E6\u622A\u5F3A\u5EA6 -weak_intensity=\u5F31 -stronger_intensity=\u8F83\u5F3A -strong_intensity=\u5F3A diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql index a43e2f046..5a38dd349 100644 --- a/src/main/resources/sql/truncate_tables.sql +++ b/src/main/resources/sql/truncate_tables.sql @@ -25,7 +25,7 @@ DELETE FROM byte_features_cfg; DELETE FROM cfg_index_info; DELETE FROM av_sign_sample_cfg; #视频场在数据库预置一条compileId为0数据 -INSERT INTO `av_sign_sample_cfg` VALUES ('10022', '1', '1', '0', '0', '16', '1', null, '0', '2018-09-06 15:56:53', null, null, '158', '2018-09-13 16:43:54', '266', '0', '0', '0', '0', '0', '0', '0', '33', '0', '0'); +--INSERT INTO `av_sign_sample_cfg` VALUES ('10022', '1', '1', '0', '0', '16', '1', null, '0', '2018-09-06 15:56:53', null, null, '158', '2018-09-13 16:43:54', '266', '0', '0', '0', '0', '0', '0', '0', '33', '0', '0'); DELETE FROM complex_keyword_cfg; #慎重清理config_group_info！ 特定服务新增的时候会预制组号，清理之后组号找不到会影响下发 DELETE FROM config_group_info; diff --git a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp index a0a8d1d90..9750f3c9c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp @@ -198,7 +198,7 @@ diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp index 2608e1f59..f2e12c7c3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp @@ -60,10 +60,9 @@ $(function(){ -
-

- +

+

@@ -73,108 +72,148 @@ $(function(){
-
- - -
-
+
+ + + + + + + + + -
-
-
-
-
- -
-
-
-
-
- -
+ + + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + +
- +
-
- -
-
- <%-- --%> - + + + + + + - - <%--
-
- " - data-off-label="" - name="cfgs[${status.index }].isValid" - value="${_cfg.isValid }" - - checked - - /> -
-
--%> -
- - + +
+
+ + + +
+
+
+ +
+
+
+
+ + + + + + + + +
- - + + + + +
+ +
    +
    • +
    • +
    • +
+
+ + <%-- --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaForm.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaForm.jsp new file mode 100644 index 000000000..df59a4685 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaForm.jsp @@ -0,0 +1,102 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ +

+ +

+ +
+
+
+
+
+ + + +
+
+
+ + + +
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp new file mode 100644 index 000000000..3c6538a81 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/groupAreaList.jsp @@ -0,0 +1,193 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + +
+ + +

+ +

+
+
+
+
+
+ + + + + + + +
+
+
+
+ + + + + +
+ + +
+ + + + + + +
+
+
+
+ + + +
+
+ <%-- --%> + + + <%-- --%> + + href="javascript:;"> + + +
+
+ + + +
+
+
+
+ + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+ +
+
+ + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ <%-- + ${fns:abbr(cfg.groupName,20)} + --%> + + + + + + + + ${cfg.creatorName }${cfg.editorName }
+
${page}
+
+
+
+
+
+ + + \ No newline at end of file