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

合并洪庆的国际化修改

Browse Source
This commit is contained in:
chenjinsong
2018-03-06 11:50:07 +08:00
parent 05ba52f8bf
commit 80bf284a1e
3 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
View File

@@ -29,8 +29,6 @@ import com.nis.web.security.UserUtils;
@RequestMapping("${adminPath}/systemService") @RequestMapping("${adminPath}/systemService")
public class SystemServiceController extends BaseController { public class SystemServiceController extends BaseController {
//TODO 异常处理
@ModelAttribute @ModelAttribute
public SystemServiceInfo get(Long id) { public SystemServiceInfo get(Long id) {
if (!StringUtil.isEmpty(id)){ if (!StringUtil.isEmpty(id)){
@@ -119,9 +117,14 @@ public class SystemServiceController extends BaseController {
@RequestMapping(value = "delete") @RequestMapping(value = "delete")
public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) { public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
systemServiceService.deleteService(systemServiceInfo); systemServiceService.deleteService(systemServiceInfo);
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo); try {
model.addAttribute("page", page); Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
addMessage(model, "删除成功"); model.addAttribute("page", page);
addMessage(model, "删除成功");
} catch (Exception e) {
addMessage(model, "删除失败：" + e.getMessage());
e.printStackTrace();
}
return "/systemService/list"; return "/systemService/list";
} }

100
src/main/webapp/WEB-INF/views/systemService/form.jsp
View File

@@ -29,20 +29,20 @@
}, },
messages: { messages: {
'serviceName':{ 'serviceName':{
required:'必填项' required:'<spring:message code="required"/>'
}, },
'serviceId':{ 'serviceId':{
required:'必填项', required:'<spring:message code="required"/>',
remote:'重复的serviceId' remote:'<spring:message code="repeat"/>'+'serviceId'
}, },
'action':{ 'action':{
required:'必填项' required:'<spring:message code="required"/>'
}, },
'serviceType':{ 'serviceType':{
required:'必填项' required:'<spring:message code="required"/>'
}, },
'serviceDesc':{ 'serviceDesc':{
required:'必填项' required:'<spring:message code="required"/>'
} }
}, },
submitHandler: function(form){ submitHandler: function(form){
@@ -57,7 +57,7 @@
} }
} }
if (flag) { if (flag) {
loading('正在提交，请稍等...'); loading('LOADING...');
$("[disabled=disabled]").attr("disabled", false); $("[disabled=disabled]").attr("disabled", false);
form.submit(); form.submit();
} else { } else {
@@ -67,7 +67,7 @@
}, },
errorContainer: "#messageBox", errorContainer: "#messageBox",
errorPlacement: function(error, element) { errorPlacement: function(error, element) {
$("#messageBox").text("输入有误，请先更正。"); $("#messageBox").text("<spring:message code='enter_error'/>");
if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){ if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
error.appendTo(element.parent().parent()); error.appendTo(element.parent().parent());
} else { } else {
@@ -91,7 +91,7 @@
$("#addBtn").attr("disabled", true); $("#addBtn").attr("disabled", true);
} else if ($(obj).val() == '1') { } else if ($(obj).val() == '1') {
if ($(".table-list").length > 1) { if ($(".table-list").length > 1) {
alert("单域业务只能关联一个表"); alert('<spring:message code="single_service_message"/>');
$(obj).val(v); $(obj).val(v);
} else if ($(".table-list").length == 1) { } else if ($(".table-list").length == 1) {
$("#addBtn").attr("disabled", true); $("#addBtn").attr("disabled", true);
@@ -102,7 +102,7 @@
$("#addBtn").attr("disabled", false); $("#addBtn").attr("disabled", false);
} else if ($(obj).val() == '3') { } else if ($(obj).val() == '3') {
if ($(".table-list").length > 1) { if ($(".table-list").length > 1) {
alert("特定服务只能关联一个表"); alert('<spring:message code="special_service_message"/>');
$(obj).val(v); $(obj).val(v);
} else if ($(".table-list").length == 1) { } else if ($(".table-list").length == 1) {
$("#addBtn").attr("disabled", true); $("#addBtn").attr("disabled", true);
@@ -156,25 +156,25 @@
'<div>' + '<div>' +
'<input type="hidden" name="sciId" value="0"/>' + '<input type="hidden" name="sciId" value="0"/>' +
'<input type="hidden" name="sciIsValid" value="1"/>' + '<input type="hidden" name="sciIsValid" value="1"/>' +
'<span class="child-label"><font color="red">*</font>表名:</span> ' + '<span class="child-label"><font color="red">*</font>'+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="tableName"/></span> ' + '<span><input class="child-required form-control child-input" name="tableName"/></span> ' +
'<span class="child-label"><font color="red">*</font>表类型:</span> ' + '<span class="child-label"><font color="red">*</font>'+'<spring:message code="table_type"/>'+':</span> ' +
'<span> ' + '<span> ' +
'<select class="child-required" name="tableType" onchange="autoServiceId()"> ' + '<select class="child-required" name="tableType" onchange="autoServiceId()"> ' +
'<option value="">请选择</option>' + '<option value="">'+'<spring:message code="select"/>'+'</option>' +
'<option value="1">IP</option>' + '<option value="1">IP</option>' +
'<option value="2">字符串</option>' + '<option value="2">'+'<spring:message code="string"/>'+'</option>' +
'<option value="3">数值</option>' + '<option value="3">'+'<spring:message code="number"/>'+'</option>' +
'<option value="4">增强字符串</option>' + '<option value="4">'+'<spring:message code="strong_string"/>'+'</option>' +
'</select>' + '</select>' +
'</span> ' + '</span> ' +
'<span class="child-label"><font color="red">*</font>MAAT表名:</span> ' + '<span class="child-label"><font color="red">*</font>MAAT '+'<spring:message code="table_name"/>'+':</span> ' +
'<span><input class="child-required form-control child-input" name="maatTable"/></span>' + '<span><input class="child-required form-control child-input" name="maatTable"/></span>' +
'</div>' + '</div>' +
'<div>' + '<div>' +
'<span class="child-label"><font color="red">*</font>表描述:</span> ' + '<span class="child-label"><font color="red">*</font>'+'<spring:message code="table_des"/>'+':</span> ' +
'<span><input class="child-required form-control child-input-desc" name="tableDesc"/></span>' + '<span><input class="child-required form-control child-input-desc" name="tableDesc"/></span>' +
'<button type="button" class="btn btn-danger del-button" onclick="del2(this)">删除</button>' + '<button type="button" class="btn btn-danger del-button" onclick="del2(this)">'+'<spring:message code="delete"/>'+'</button>' +
'</div>' + '</div>' +
'</div>' '</div>'
); );
@@ -200,11 +200,11 @@
<div class="page-content"> <div class="page-content">
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="history.go(-1)">返回</button> <button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
系统业务管理 <spring:message code="sysService_manage"/>
</h3> </h3>
<div class="row"> <div class="row">
@@ -212,7 +212,7 @@
<div class="portlet box blue"> <div class="portlet box blue">
<div class="portlet-title"> <div class="portlet-title">
<div class="caption"> <div class="caption">
<i class="fa fa-gift"></i>详情</div> <i class="fa fa-gift"></i><spring:message code="add"/></div>
</div> </div>
<div class="portlet-body form"> <div class="portlet-body form">
@@ -224,46 +224,46 @@
<sys:message content="${message}"/> <sys:message content="${message}"/>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>业务名称:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="service_name"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:input path="serviceName" htmlEscape="false" maxlength="30" class="required form-control"/> <form:input path="serviceName" htmlEscape="false" maxlength="30" class="required form-control"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>动作:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="act"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:select id="action" path="action" class="required form-control" onchange="autoServiceId()"> <form:select id="action" path="action" class="required form-control" onchange="autoServiceId()">
<form:option value="">请选择</form:option> <form:option value=""><spring:message code="select"/></form:option>
<form:option value="1">阻断</form:option> <form:option value="1"><spring:message code="block"/></form:option>
<form:option value="2">监测</form:option> <form:option value="2"><spring:message code="monitor"/></form:option>
<form:option value="5">封堵白名单</form:option> <form:option value="5"><spring:message code="block_white_list"/></form:option>
<form:option value="6">监测白名单</form:option> <form:option value="6"><spring:message code="monitor_white_list"/></form:option>
<form:option value="7">封堵监测白名单</form:option> <form:option value="7"><spring:message code="block_monitor_white_list"/></form:option>
<form:option value="8">灰名单</form:option> <form:option value="8"><spring:message code="grey_list"/></form:option>
</form:select> </form:select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>类型:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="type"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:select id="serviceType" path="serviceType" class="required form-control" onclick="now=this.value" onchange="changeType(now, this)"> <form:select id="serviceType" path="serviceType" class="required form-control" onclick="now=this.value" onchange="changeType(now, this)">
<form:option value="">请选择</form:option> <form:option value=""><spring:message code="select"/></form:option>
<form:option value="1">单域</form:option> <form:option value="1"><spring:message code="single_domain"/></form:option>
<form:option value="2">多域</form:option> <form:option value="2"><spring:message code="multi_domain"/></form:option>
<form:option value="3">特定服务</form:option> <form:option value="3"><spring:message code="special_service"/></form:option>
</form:select> </form:select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">数据库表:</label> <label class="col-md-3 control-label"><spring:message code="datebase_table"/>:</label>
<div class="col-md-8" id="datatables"> <div class="col-md-8" id="datatables">
<shiro:hasPermission name="system:service:edit"> <shiro:hasPermission name="system:service:edit">
<div> <div>
<button id="addBtn" type="button" class="btn btn-default" onclick="addDatatable()">增加</button> <button id="addBtn" type="button" class="btn btn-default" onclick="addDatatable()"><spring:message code="add"/></button>
<label for="childTableFlag" class="error" style="display:none">有未填项</label> <label for="childTableFlag" class="error" style="display:none"><spring:message code="fill_all"/></label>
</div> </div>
</shiro:hasPermission> </shiro:hasPermission>
<c:forEach items="${systemServiceInfo.serviceConfigInfoList }" var="serviceConfigInfo"> <c:forEach items="${systemServiceInfo.serviceConfigInfoList }" var="serviceConfigInfo">
@@ -272,28 +272,28 @@
<input type="hidden" name="sciId" value="${serviceConfigInfo.id }"/> <input type="hidden" name="sciId" value="${serviceConfigInfo.id }"/>
<input type="hidden" name="sciIsValid" value="1"/> <input type="hidden" name="sciIsValid" value="1"/>
<span class="child-label"><font color="red">*</font>表名:</span> <span class="child-label"><font color="red">*</font><spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="tableName" value="${serviceConfigInfo.tableName }"/></span> <span><input class="child-required form-control child-input" name="tableName" value="${serviceConfigInfo.tableName }"/></span>
<span class="child-label"><font color="red">*</font>表类型:</span> <span class="child-label"><font color="red">*</font><spring:message code="table_type"/>:</span>
<span> <span>
<select class="child-required" name="tableType"> <select class="child-required" name="tableType">
<option value="">请选择</option> <option value=""><spring:message code="select"/></option>
<option value="1" <c:if test="${serviceConfigInfo.tableType eq 1}">selected="selected"</c:if>>IP</option> <option value="1" <c:if test="${serviceConfigInfo.tableType eq 1}">selected="selected"</c:if>>IP</option>
<option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>>字符串</option> <option value="2" <c:if test="${serviceConfigInfo.tableType eq 2}">selected="selected"</c:if>><spring:message code="string"/></option>
<option value="3" <c:if test="${serviceConfigInfo.tableType eq 3}">selected="selected"</c:if>>数值</option> <option value="3" <c:if test="${serviceConfigInfo.tableType eq 3}">selected="selected"</c:if>><spring:message code="number"/></option>
<option value="4" <c:if test="${serviceConfigInfo.tableType eq 4}">selected="selected"</c:if>>增强字符串</option> <option value="4" <c:if test="${serviceConfigInfo.tableType eq 4}">selected="selected"</c:if>><spring:message code="strong_string"/></option>
</select> </select>
</span> </span>
<span class="child-label"><font color="red">*</font>MAAT表名:</span> <span class="child-label"><font color="red">*</font>MAAT <spring:message code="table_name"/>:</span>
<span><input class="child-required form-control child-input" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span> <span><input class="child-required form-control child-input" name="maatTable" value="${serviceConfigInfo.maatTable }"/></span>
</div> </div>
<div> <div>
<span class="child-label"><font color="red">*</font>表描述:</span> <span class="child-label"><font color="red">*</font><spring:message code="table_des"/>:</span>
<span><input class="child-required form-control child-input-desc" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span> <span><input class="child-required form-control child-input-desc" name="tableDesc" value="${serviceConfigInfo.tableDesc }"/></span>
<button type="button" class="btn btn-danger del-button" onclick="del(this)">删除</button> <button type="button" class="btn btn-danger del-button" onclick="del(this)"><spring:message code="delete"/></button>
</div> </div>
</div> </div>
</c:forEach> </c:forEach>
@@ -301,14 +301,14 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>业务ID:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="service_id"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input id="serviceIdInput" class="required form-control" name="serviceId" value="${systemServiceInfo.serviceId }" readonly="readonly"> <input id="serviceIdInput" class="required form-control" name="serviceId" value="${systemServiceInfo.serviceId }" 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>描述:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="describe"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<form:textarea path="serviceDesc" htmlEscape="false" class="required form-control"/> <form:textarea path="serviceDesc" htmlEscape="false" class="required form-control"/>
</div> </div>

7
src/main/webapp/static/pages/css/systemService.css
View File

@@ -20,12 +20,7 @@ select, input {
/* form */ /* form */
.child-input { .child-input {
width: 160px !important; width: 50% !important;
display: inline !important;
margin: 6px 5px 6px 5px;
}
.child-input-desc {
width: 320px !important;
display: inline !important; display: inline !important;
margin: 6px 5px 6px 5px; margin: 6px 5px 6px 5px;
} }