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

优化app topic domain界面，去掉domain重复性判断

Browse Source
This commit is contained in:
duandongmei
2018-09-03 13:52:06 +08:00
parent ba295706f3
commit d9d5e2be36
3 changed files with 283 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/nis/web/controller/configuration/AppCfgController.java
View File

@@ -1083,17 +1083,14 @@ public class AppCfgController extends BaseController {
@RequestMapping(value = {"saveAppTopicDomainCfg"})
@RequiresPermissions(value={"app:topic:config"})
public String saveAppTopicDomainCfg(Model model,HttpServletRequest request,HttpServletResponse response,
AppTopicDomainCfg entity,@RequestParam("userDomain")String userDomain,RedirectAttributes redirectAttributes) {
AppTopicDomainCfg entity,RedirectAttributes redirectAttributes) {
try {
//验证域名的重复行
if(!StringUtil.isBlank(userDomain)){
if(!StringUtil.isBlank(entity.getDomain())){
WebsiteDomainTopic websiteDomainTopic = new WebsiteDomainTopic();
websiteDomainTopic.setDomain(userDomain);
websiteDomainTopic.setDomain(entity.getDomain());
List<WebsiteDomainTopic> domainDict = appCfgService.getDomainDict(websiteDomainTopic);
if((domainDict!=null&&domainDict.size()>0)){
addMessage(redirectAttributes,"domain_existed");
return "redirect:" + adminPath +"/app/topicDomainCfgList?functionId="+entity.getFunctionId();
}else{
if((domainDict==null || domainDict.size()==0)){
//保存到域名关联表中
if(entity!=null&&entity.getWebsiteServiceId()!=null&&entity.getTopicId()!=null){
websiteDomainTopic.setWebsiteServiceId(entity.getWebsiteServiceId());
@@ -1108,8 +1105,8 @@ public class AppCfgController extends BaseController {
}
}
}
if(entity!=null&&StringUtil.isBlank(entity.getDomain())&&!StringUtil.isBlank(userDomain)){
entity.setDomain(userDomain);//自定义域名
if(entity!=null&&StringUtil.isBlank(entity.getDomain())&&!StringUtil.isBlank(entity.getDomain())){
entity.setDomain(entity.getDomain());
}
appCfgService.saveOrUpdateAppTopicDomainCfg(entity);
addMessage(redirectAttributes,"save_success");

2
src/main/resources/sql/update_function_region_dict.sql Normal file
View File

@@ -0,0 +1,2 @@
--修改topic_domain默认无表达式
update function_region_dict set config_expr_type=0,config_hex=0 where dict_id=179;

541
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -42,95 +42,101 @@ $(function(){
errorContainer: "#messageBox",
});
//页面加载时触发初始化操作
var file = $("#domain").val();
if(!file){
$("#userDomain").hide();//隐藏输入框
$("#response").val("domain");
$("#domain").selectpicker("show");//隐藏选择框
}else{
$("#domain").selectpicker("hide");//隐藏选择框
$("#response").val("userDomain");
$("#userDomain").show();//隐藏输入框
}
$("#response").on("change",function(){
var $this = $(this);
var inputId = $this.val();
$("#userDomain").val("");//清空
$("#domain").selectpicker("val","");
if("userDomain" == inputId){
$("#userDomain").show();//显示输入框
$("#domain").selectpicker("hide");//隐藏选择框
}else{
$("#userDomain").hide();//隐藏输入框
$("#domain").selectpicker("show");//显示选择框
}
});
//
if('${_cfg.domain}'){
ajaxDomain($("#websiteServiceId").val(),$("#topicId").val());
}
//选择主题跟服务 查询域名
$("#topicId").on("change",function(){
var websiteServiceId = $("#websiteServiceId").val();
if(websiteServiceId!=null&&websiteServiceId!=''){
ajaxDomain(websiteServiceId,$("#topicId").val());
}
});
$("#websiteServiceId").on("change",function(){
var topicId =$("#topicId").val();
if(topicId!=null&&topicId!=''){
ajaxDomain($("#websiteServiceId").val(),topicId);
}
});
});
//页面加载时触发初始化操作
/* var file = $("#domain").val();
if(!file){
//$("#userDomain").hide();//隐藏输入框
//$("#response").val("domain");
//$("#domain").selectpicker("show");//隐藏选择框
}else{
//$("#domain").selectpicker("hide");//隐藏选择框
//$("#response").val("userDomain");
//$("#userDomain").show();//隐藏输入框
} */
/* $("#response").on("change",function(){
var $this = $(this);
var inputId = $this.val();
$("#userDomain").val("");//清空
$("#domain").selectpicker("val","");
if("userDomain" == inputId){
$("#userDomain").show();//显示输入框
$("#domain").selectpicker("hide");//隐藏选择框
}else{
$("#userDomain").hide();//隐藏输入框
$("#domain").selectpicker("show");//显示选择框
}
}); */
if('${_cfg.domain}'){
ajaxDomain($("#websiteServiceId").val(),$("#topicId").val());
}
//选择主题跟服务 查询域名
$("#topicId").on("change",function(){
var websiteServiceId = $("#websiteServiceId").val();
if(websiteServiceId!=null&&websiteServiceId!=''){
ajaxDomain(websiteServiceId,$("#topicId").val());
}
});
$("#websiteServiceId").on("change",function(){
var topicId =$("#topicId").val();
if(topicId!=null&&topicId!=''){
ajaxDomain($("#websiteServiceId").val(),topicId);
}
});
$("#selectDomain").on("change",function(){
var domain =$("#selectDomain").val();
if(domain!=null&&domain!=''){
$("input[name='domain']").val(domain);
}
});
$("input[name='domain']").val('${_cfg.domain}');
});
function ajaxDomain(webId,topicId){
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
$.ajax({
type:'get',
url:'${ctx}/app/WebsiteDomainTopicList',
data:{"websiteServiceId":webId,"topicId":topicId},
dataType:'json',
async:true,
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
var html='<select name="domain" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option>';
if(data.length>0){
for(i=0;i<data.length;i++){
html+='<option value="'+data[i].domain+'"';
if('${_cfg.domain}'==data[i].domain){
html+=" selected";
}
html+='>'+data[i].domain+'</option>';
}
html+='</select>';
$("#domain").html(html);
$("[name='domain']").selectpicker("refresh");
$("[name='domain']").selectpicker("render");
}else{
html+='</select>';
$("#domain").html(html);
$("[name='domain']").selectpicker("refresh");
$("[name='domain']").selectpicker("render");
//根据topic和website动态加载域名选项
function ajaxDomain(webId,topicId){
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
$.ajax({
type:'get',
url:'${ctx}/app/WebsiteDomainTopicList',
data:{"websiteServiceId":webId,"topicId":topicId},
dataType:'json',
async:true,
success:function(data,textStatus){//处理返回结果
if(textStatus=="success"){
var html='<select name="domain" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option>';
if(data.length>0){
for(i=0;i<data.length;i++){
html+='<option value="'+data[i].domain+'"';
if('${_cfg.domain}'==data[i].domain){
html+=" selected";
}
}
},
complete:function(XMLHttpRequest,status){//超时设置
if(status=="timeout"){
var html='<select name="domain" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option></select>';
$("#domain").html(html);
$("[name='domain']").selectpicker("refresh");
$("[name='domain']").selectpicker("render");
}
}
});
html+='>'+data[i].domain+'</option>';
}
html+='</select>';
$("#selectDomain").html(html);
$("[name='selectDomain']").selectpicker("refresh");
$("[name='selectDomain']").selectpicker("render");
}else{
html+='</select>';
$("#selectDomain").html(html);
$("[name='selectDomain']").selectpicker("refresh");
$("[name='selectDomain']").selectpicker("render");
}
}
},
complete:function(XMLHttpRequest,status){//超时设置
if(status=="timeout"){
var html='<select name="selectDomain" data-live-search="true" class="selectpicker form-control">'
+'<option value=""><spring:message code="select"/></option></select>';
$("#selectDomain").html(html);
$("[name='selectDomain']").selectpicker("refresh");
$("[name='selectDomain']").selectpicker("render");
}
}
});
}
</script>
</head>
<body>
@@ -195,134 +201,156 @@ $(function(){
</div>
</div>
<div class="row">
<div class="row">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="website_server" /></label>
<div class="col-md-6">
<form:select path="_cfg.websiteServiceId" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('WEBSITE_SERVER') }" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<input type="hidden" name="cfgType" value="${region.configRegionValue }">
<input type="hidden" name="cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
<input type="hidden" name="configMultiKeywords" value="${region.configMultiKeywords }">
<input type="hidden" name="configServiceType" value="${region.configServiceType }">
<input type="hidden" name="configHex" value="${region.configHex }">
<div class="row">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</form:select>
</div>
<div for="websiteServiceId"></div>
</div>
<div for="action"></div>
</div>
</div>
<div class="col-md-6" hidden="true">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
<!-- WEBSITE -->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="website_server" /></label>
<div class="col-md-6">
<form:select path="_cfg.websiteServiceId" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('WEBSITE_SERVER') }" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
<div for="websiteServiceId"></div>
</div>
</div>
<!-- WEBSITE -->
<!-- EXPRTYPE -->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="expression_type" /></label>
<div class="col-md-6">
<c:if test="${!empty region.configExprType}">
<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq exprType}">
<label class="radio-inline">
<input type="radio"
name="exprType" value="${exprType }"
class="required"
<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${empty region.configExprType}">
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq 0}">
<label class="radio-inline">
<input type="radio"
name="exprType" value="${exprTypeC.itemCode }"
class="required" checked >
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:if>
</div>
<div for="exprType"></div>
</div>
</div>
<!-- EXPRTYPE -->
</div>
<div class="col-md-6" hidden="true">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
<!-- 是否区分大小写 ========== -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<div class="row">
<c:if test="${!empty region.configHex}">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</c:if>
<c:if test="${empty region.configHex}">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
checked
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</c:if>
</div>
</c:if>
</c:forEach>
<!-- 是否区分大小写end ========== -->
</div>
<div class="row">
<!-- 域名 -->
<div class="col-md-6">
<div class="form-group">
<div class="col-md-5"><label class="col-md-4"></label><font style="papadding-left: 10px" color="red">*</font>
<select id="response" class="selectpicker select2 input-small pull-right">
<option value="domain"><spring:message code="domain"></spring:message></option>
<option value="userDomain"><spring:message code="please_input"></spring:message></option>
</select>
</div>
<div class="col-md-4">
<input id="userDomain" name="userDomain" class="form-control required domainCheck" type="text" value="">
<select id="domain" name="domain" data-live-search="true" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
</select>
<div for="domain"></div>
<div for="userDomain"></div>
</div>
</div>
</div>
<!-- -->
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<div class="col-md-6">
<!-- MATCH-METHOD -->
<div class="row">
<!-- 域名 -->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="domain" /></label>
<div class="row">
<div class="col-md-3">
<select id="selectDomain" name="selectDomain" data-live-search="true" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
</select>
</div>
<div class="col-md-3">
<input id="domain" name="domain" class="form-control required domainCheck" type="text" value="">
</div>
<div for="domain"></div>
</div>
<%-- <div class="col-md-5"><label class="col-md-4"></label><font style="papadding-left: 10px" color="red">*</font>
<select id="response" class="selectpicker select2 input-small pull-right">
<option value="domain"><spring:message code="domain"></spring:message></option>
<option value="userDomain"><spring:message code="please_input"></spring:message></option>
</select>
</div>
<div class="col-md-4">
<input id="userDomain" name="userDomain" class="form-control required domainCheck" type="text" value="">
<select id="domain" name="domain" data-live-search="true" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
</select>
<div for="domain"></div>
<div for="userDomain"></div>
</div> --%>
</div>
</div>
<!-- 域名 -->
<!-- MATCH-METHOD -->
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="match_method" /></label>
@@ -360,62 +388,12 @@ $(function(){
</select>
</div>
<div for="matchMethod"></div>
</div>
</div>
</c:if>
</c:forEach>
</div>
<c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}">
<input type="hidden" name="cfgType" value="${region.configRegionValue}">
<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode}">
<div class="row">
<div class="col-md-6 ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="expression_type" /></label>
<div class="col-md-6">
<c:if test="${!empty region.configExprType}">
<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq exprType}">
<label class="radio-inline">
<input type="radio"
name="exprType" value="${exprType }"
class="required"
<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:forEach>
</c:if>
<c:if test="${empty region.configExprType}">
<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
<c:if test="${exprTypeC.itemCode eq 0}">
<label class="radio-inline">
<input type="radio"
name="exprType" value="${exprTypeC.itemCode }"
class="required" checked >
<spring:message code="${exprTypeC.itemValue }" />
</label>
</c:if>
</c:forEach>
</c:if>
</div>
<div for="exprType"></div>
</div>
</div>
</div>
</div>
<div class="row">
<!-- is hex -->
<div class="row">
<c:if test="${!empty region.configHex}">
<div class="col-md-6">
<div class="form-group ">
@@ -433,6 +411,22 @@ $(function(){
<div for="isHex"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</c:if>
<c:if test="${empty region.configHex}">
<div class="col-md-6">
@@ -447,6 +441,19 @@ $(function(){
<div for="isHex"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
checked
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</c:if>
</div>
<div class="row hidden">
@@ -490,8 +497,10 @@ $(function(){
</div>
</div>
</div>
<!-- is hex -->
</c:if>
</c:forEach>
</c:forEach>
</div>
<input name="isAreaEffective" type="hidden" value="0">
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>