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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-09-12 19:16:50 +08:00
parent 3b3cd99adf 27c5f7a9ba
commit 9f459ad014
6 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml
View File

@@ -166,7 +166,6 @@
</select> </select>
<insert id="insert" parameterType="com.nis.domain.configuration.DnsResStrategy" > <insert id="insert" parameterType="com.nis.domain.configuration.DnsResStrategy" >
insert into dns_res_strategy ( insert into dns_res_strategy (
CFG_ID,
CFG_DESC, CFG_DESC,
ACTION, ACTION,
IS_VALID, IS_VALID,
@@ -201,7 +200,6 @@
compile_Id, compile_Id,
cfg_region_code cfg_region_code
)values ( )values (
#{cfgId,jdbcType=VARCHAR},
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
0, 0,

6
src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java
View File

@@ -15,6 +15,7 @@ import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.maat.ToMaatResult; import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.DnsResStrategyDao; import com.nis.web.dao.configuration.DnsResStrategyDao;
import com.nis.web.security.UserUtils; import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService; import com.nis.web.service.BaseService;
@@ -62,7 +63,10 @@ public class DnsResStrategyService extends BaseService{
public void saveOrUpdate(DnsResStrategy entity){ public void saveOrUpdate(DnsResStrategy entity){
Date createTime=new Date(); Date createTime=new Date();
setAreaEffectiveIds(entity); setAreaEffectiveIds(entity);
List<DnsResStrategy> list=dnsResStrategyDao.findList(entity.getCfgId(),null,null); List<DnsResStrategy> list = new ArrayList<DnsResStrategy>();
if( entity.getCfgId()!=null && !"".equals(entity.getCfgId())){
list=dnsResStrategyDao.findList(entity.getCfgId(),null,null);
}
//新增 //新增
if(list==null || list.size()==0){ if(list==null || list.size()==0){
entity.initDefaultValue(); entity.initDefaultValue();

4
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -214,12 +214,12 @@ label.errorShow {
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:input path="itemCode" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/> <form:input path="itemCode" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
</div> </div>
</div> </div> --%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<div class="col-md-4"> <div class="col-md-4">

4
src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp
View File

@@ -57,12 +57,12 @@
<input value=<spring:message code="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}"/> maxlength="50" class="form-control" readonly="readonly"/> <input value=<spring:message code="${fns:getDictLabel('SERVICE_DICT_ITM_TYPE',serviceDictInfo.itemType,'0')}"/> maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div>
<div class="form-group"> <%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_code"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/> <input value="${serviceDictInfo.itemCode}" maxlength="50" class="form-control" readonly="readonly"/>
</div> </div>
</div> </div> --%>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="item_value"/>:</label>
<div class="col-md-4"> <div class="col-md-4">

10
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -163,12 +163,12 @@
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-small" > <select id="seltype" class="selectpicker select2 input-small" >
<option value="itemCode"><spring:message code="item_code"></spring:message></option> <%-- <option value="itemCode"><spring:message code="item_code"></spring:message></option> --%>
<option value="itemValue"><spring:message code="config_content"></spring:message></option> <option value="itemValue"><spring:message code="config_content"></spring:message></option>
</select> </select>
</div> </div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='item_code'></spring:message>" type="text" maxlength="60"> <input id="intype" class="form-control input-medium" placeholder="<spring:message code='config_content'></spring:message>" type="text" maxlength="60">
</div> </div>
@@ -279,7 +279,7 @@
<tr> <tr>
<th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th> <th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
<!-- <th>序号</th> --> <!-- <th>序号</th> -->
<th><spring:message code="item_code"/></th> <%-- <th><spring:message code="item_code"/></th> --%>
<th><spring:message code="config_content"/></th> <th><spring:message code="config_content"/></th>
<th><spring:message code="desc"/></th> <th><spring:message code="desc"/></th>
<th><spring:message code="item_type"/></th> <th><spring:message code="item_type"/></th>
@@ -296,8 +296,8 @@
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}"> <tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td> <td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
<%-- <td>${serviceDictInfo.showSequence}</td> --%> <%-- <td>${serviceDictInfo.showSequence}</td> --%>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td> <%-- <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td> --%>
<td>${serviceDictInfo.itemValue}</td> <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td> <td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
<td><spring:message code='${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}'/></td> <td><spring:message code='${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}'/></td>
<td><spring:message code='${fns:getDictLabel("INT_YES_NO",serviceDictInfo.isLeaf,"0")}'/></td> <td><spring:message code='${fns:getDictLabel("INT_YES_NO",serviceDictInfo.isLeaf,"0")}'/></td>

17
src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
View File

@@ -19,9 +19,9 @@ $(function(){
}, },
submitHandler: function(form){ submitHandler: function(form){
var flag = true; var flag = true;
var cfgId=$("#cfgId").val(); //var cfgId=$("#cfgId").val();
var message=""; var message="";
if(flag){ /* if(flag){
if($("#isAdd").val() == 'true'){ if($("#isAdd").val() == 'true'){
$.ajax({ $.ajax({
type:'post', type:'post',
@@ -38,15 +38,15 @@ $(function(){
}); });
} }
} } */
if(flag){ /* if(flag){
$("#cfgId").removeClass("error"); $("#cfgId").removeClass("error");
$("#cfgId").attr("aria-invalid","false"); $("#cfgId").attr("aria-invalid","false");
}else{ }else{
$("div[for=cfgId]").html("<label for=\"cfgId\" class=\"error\" id=\"cfgId-error\">"+message+"</label>"); $("div[for=cfgId]").html("<label for=\"cfgId\" class=\"error\" id=\"cfgId-error\">"+message+"</label>");
$("#cfgId").addClass("error"); $("#cfgId").addClass("error");
$("#cfgId").attr("aria-invalid","true"); $("#cfgId").attr("aria-invalid","true");
} } */
if(flag){ if(flag){
var maxTtl=$("[name=maxTtl]").val(); var maxTtl=$("[name=maxTtl]").val();
maxTtl = parseInt(maxTtl); maxTtl = parseInt(maxTtl);
@@ -93,6 +93,9 @@ $(function(){
<input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}"> <input type="hidden" id="compileId" name="compileId" value="${_cfg.compileId}">
<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0"> <input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
<input type="hidden" id="isAdd" name="isAdd" value="${isAdd}"> <input type="hidden" id="isAdd" name="isAdd" value="${isAdd}">
<input type="hidden" id="cfgId" name="cfgId" value="${_cfg.cfgId}">
<!-- 配置域类型 --> <!-- 配置域类型 -->
<c:forEach items="${regionList}" var="region"> <c:forEach items="${regionList}" var="region">
<c:if test="${_cfg.functionId eq region.functionId}"> <c:if test="${_cfg.functionId eq region.functionId}">
@@ -102,7 +105,7 @@ $(function(){
</c:forEach> </c:forEach>
<div class="form-body"> <div class="form-body">
<div class="row"> <div class="row">
<div class="col-md-6"> <%-- <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_number"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_number"/></label>
<div class="col-md-6"> <div class="col-md-6">
@@ -110,7 +113,7 @@ $(function(){
</div> </div>
<div for="cfgId"></div> <div for="cfgId"></div>
</div> </div>
</div> </div> --%>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_name"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="policy_name"/></label>