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

将业务/系统字典，特定服务，协议ip权限控制add和delete从edit中细分出来

Browse Source
This commit is contained in:
zhangshilin
2018-04-10 18:04:25 +08:00
parent 00b1d19065
commit ea1cdfb5f8
8 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
View File

@@ -125,7 +125,7 @@ public class ServiceDictInfoController extends BaseController {
* @param model * @param model
* @return * @return
*/ */
@RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR) @RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
@RequestMapping(value={"form"}) @RequestMapping(value={"form"})
public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) { public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) {
if(doAction!=null&&doAction.equals("0")){ if(doAction!=null&&doAction.equals("0")){
@@ -149,7 +149,7 @@ public class ServiceDictInfoController extends BaseController {
* @param redirectAttributes * @param redirectAttributes
* @return * @return
*/ */
@RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) @RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate") @RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) { public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) {
@@ -173,7 +173,7 @@ public class ServiceDictInfoController extends BaseController {
* @param model * @param model
* @return * @return
*/ */
@RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) @RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
@RequestMapping(value={"delete"}) @RequestMapping(value={"delete"})
public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try { try {

6
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -121,7 +121,7 @@ public class SysDictInfoController extends BaseController {
* @param model * @param model
* @return * @return
*/ */
@RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit","basics:area:view","basics:isp:view","basics:scope:view"},logical=Logical.OR) @RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit","basics:area:view","basics:isp:view","basics:scope:view"},logical=Logical.OR)
@RequestMapping(value={"form"}) @RequestMapping(value={"form"})
public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) { public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) {
if(doAction!=null&&doAction.equals("0")){ if(doAction!=null&&doAction.equals("0")){
@@ -149,7 +149,7 @@ public class SysDictInfoController extends BaseController {
* @param redirectAttributes * @param redirectAttributes
* @return * @return
*/ */
@RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) @RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate") @RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) { public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) {
@@ -170,7 +170,7 @@ public class SysDictInfoController extends BaseController {
* @param model * @param model
* @return * @return
*/ */
@RequiresPermissions(value={"basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR) @RequiresPermissions(value={"basics:area:del","basics:isp:del","basics:scope:del"},logical=Logical.OR)
@RequestMapping(value={"delete"}) @RequestMapping(value={"delete"})
public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) { public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
try { try {

6
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -119,7 +119,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param mulitId * @param mulitId
* @return * @return
*/ */
@RequiresPermissions(value={"specific:service:edit","specific:service:view"},logical=Logical.OR) @RequiresPermissions(value={"specific:service:add","specific:service:edit","specific:service:view"},logical=Logical.OR)
@RequestMapping(value = { "form" }) @RequestMapping(value = { "form" })
public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction) { public String form(SpecificServiceCfg specificServiceCfg, Model model, String doAction) {
if(specificServiceCfg!=null&&specificServiceCfg.getSpecServiceId()!=null){ if(specificServiceCfg!=null&&specificServiceCfg.getSpecServiceId()!=null){
@@ -144,7 +144,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param redirectAttributes * @param redirectAttributes
* @return * @return
*/ */
@RequiresPermissions("specific:service:edit") @RequiresPermissions(value= {"specific:service:add","specific:service:edit"},logical=Logical.OR)
@RequestMapping(value="saveOrUpdate") @RequestMapping(value="saveOrUpdate")
public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model, public String saveOrUpdate(SpecificServiceCfg specificServiceCfg, Model model,
RedirectAttributes redirectAttributes,Integer oldId) { RedirectAttributes redirectAttributes,Integer oldId) {
@@ -165,7 +165,7 @@ public class SpecificServiceCfgController extends BaseController {
* @param mulitId * @param mulitId
* @return * @return
*/ */
@RequiresPermissions("specific:service:edit") @RequiresPermissions("specific:service:del")
@RequestMapping(value="delete") @RequestMapping(value="delete")
public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){ public String delete(SpecificServiceCfg specificServiceCfg, RedirectAttributes redirectAttributes, String mulitId){
try{ try{

7
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -67,7 +68,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param model * @param model
* @return * @return
*/ */
@RequiresPermissions("specific:serviceIp:edit") @RequiresPermissions(value= {"specific:serviceIp:add","specific:serviceIp:edit"},logical=Logical.OR)
@RequestMapping(value = "form") @RequestMapping(value = "form")
public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) { public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) {
//查询协议id供下拉选择 //查询协议id供下拉选择
@@ -84,7 +85,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param mulitId * @param mulitId
* @return * @return
*/ */
@RequiresPermissions("specific:serviceIp:edit") @RequiresPermissions(value= {"specific:serviceIp:add","specific:serviceIp:edit"},logical=Logical.OR)
@RequestMapping(value = "saveOrUpdate") @RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){ public String saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg,Model model,RedirectAttributes redirectAttributes){
try { try {
@@ -103,7 +104,7 @@ public class SpecificServiceHostCfgController extends BaseController {
* @param mulitId * @param mulitId
* @return * @return
*/ */
@RequiresPermissions("specific:serviceIp:edit") @RequiresPermissions("specific:serviceIp:del")
@RequestMapping(value="delete") @RequestMapping(value="delete")
public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){ public String delete(SpecificServiceHostCfg specificServiceHostCfg, RedirectAttributes redirectAttributes, String mulitId){
try{ try{

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

@@ -109,7 +109,7 @@
<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="javascript:window.location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%> <%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%>
<shiro:hasPermission name="basics:${permission_type}:edit"> <shiro:hasPermission name="basics:${permission_type}:add">
<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button> <button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button>
</shiro:hasPermission> </shiro:hasPermission>
</div> </div>
@@ -181,9 +181,11 @@
<shiro:hasPermission name="basics:${permission_type}:edit"> <shiro:hasPermission name="basics:${permission_type}:edit">
<button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/basics/serviceDictInfo/form?itType=${itType}')"> <button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/basics/serviceDictInfo/form?itType=${itType}')">
<i class="fa fa-edit"></i> <spring:message code="edit" /></button> <i class="fa fa-edit"></i> <spring:message code="edit" /></button>
</shiro:hasPermission>
<shiro:hasPermission name="basics:${permission_type}:del">
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/basics/serviceDictInfo/delete?itType=${itType}')"> <button type="button" class="btn btn-default" onclick="cmd('${ctx}/basics/serviceDictInfo/delete?itType=${itType}')">
<i class="fa fa-trash"></i><spring:message code="delete" /></button> <i class="fa fa-trash"></i><spring:message code="delete" /></button>
</shiro:hasPermission> </shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips" <a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="<spring:message code="custom_columns" />" href="javascript:;"> data-container="body" data-placement="top" data-original-title="<spring:message code="custom_columns" />" href="javascript:;">

6
src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
View File

@@ -129,7 +129,7 @@
<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="javascript:window.location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%> <%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%>
<shiro:hasPermission name="basics:${permission_type}:edit"> <shiro:hasPermission name="basics:${permission_type}:add">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'"> onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
@@ -205,9 +205,11 @@
<shiro:hasPermission name="basics:${permission_type}:edit"> <shiro:hasPermission name="basics:${permission_type}:edit">
<button type="button" class="btn btn-default" onclick="cmdSysEdit('${ctx}/basics/sysDictInfo/form?itType=${itType}')"> <button type="button" class="btn btn-default" onclick="cmdSysEdit('${ctx}/basics/sysDictInfo/form?itType=${itType}')">
<i class="fa fa-edit"></i> <spring:message code="edit"/> </button> <i class="fa fa-edit"></i> <spring:message code="edit"/> </button>
</shiro:hasPermission>
<shiro:hasPermission name="basics:${permission_type}:del">
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/basics/sysDictInfo/delete?itType=${itType}')"> <button type="button" class="btn btn-default" onclick="cmd('${ctx}/basics/sysDictInfo/delete?itType=${itType}')">
<i class="fa fa-trash"></i> <spring:message code="delete"/> </button> <i class="fa fa-trash"></i> <spring:message code="delete"/> </button>
</shiro:hasPermission> </shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips" <a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="<spring:message code="custom_columns" />" href="javascript:;"> data-container="body" data-placement="top" data-original-title="<spring:message code="custom_columns" />" href="javascript:;">

6
src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
View File

@@ -125,7 +125,7 @@
<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="javascript:window.location='${ctx}/specific/specificServiceCfg/list'"><spring:message code="refresh"></spring:message></button> --%> <%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/specific/specificServiceCfg/list'"><spring:message code="refresh"></spring:message></button> --%>
<shiro:hasPermission name="specific:service:edit"> <shiro:hasPermission name="specific:service:add">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/specific/specificServiceCfg/form'"> onClick="javascript:window.location='${ctx}/specific/specificServiceCfg/form'">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
@@ -187,9 +187,11 @@
<shiro:hasPermission name="specific:service:edit"> <shiro:hasPermission name="specific:service:edit">
<button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/specific/specificServiceCfg/form')"> <button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/specific/specificServiceCfg/form')">
<i class="fa fa-edit"></i> <spring:message code="edit"/></button> <i class="fa fa-edit"></i> <spring:message code="edit"/></button>
</shiro:hasPermission>
<shiro:hasPermission name="specific:service:del">
<button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/delete')"> <button type="button" class="btn btn-default" onclick="cmd('${ctx}/specific/specificServiceCfg/delete')">
<i class="fa fa-trash"></i> <spring:message code="delete"/></button> <i class="fa fa-trash"></i> <spring:message code="delete"/></button>
</shiro:hasPermission> </shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips" <a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="<spring:message code='custom_columns'/>" href="javascript:;"> data-container="body" data-placement="top" data-original-title="<spring:message code='custom_columns'/>" href="javascript:;">

46
src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
View File

@@ -8,21 +8,12 @@
//筛选功能初始化 //筛选功能初始化
filterActionInit(); filterActionInit();
$("#isAudit").change(function(){
page();
});
$("#direction").change(function(){ $("#direction").change(function(){
page(); page();
}); });
$("#protocol").change(function(){ $("#protocol").change(function(){
page(); page();
}); });
$("#ipType").change(function(){
page();
});
$("#ipType").change(function(){
page();
});
//全选及取消 //全选及取消
$("#checkAll").change(function(){ $("#checkAll").change(function(){
if($("#checkAll").prop("checked")){ if($("#checkAll").prop("checked")){
@@ -92,7 +83,7 @@
<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="javascript:window.location='${ctx}/specific/specificServiceHostCfg/list'"><spring:message code="refresh"></spring:message></button> --%> <%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/specific/specificServiceHostCfg/list'"><spring:message code="refresh"></spring:message></button> --%>
<shiro:hasPermission name="specific:serviceIp:edit"> <shiro:hasPermission name="specific:serviceIp:add">
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/specific/specificServiceHostCfg/form'"> onClick="javascript:window.location='${ctx}/specific/specificServiceHostCfg/form'">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
@@ -130,22 +121,6 @@
<form:option value="${specService.specServiceId}">${specService.specServiceName}</form:option> <form:option value="${specService.specServiceId}">${specService.specServiceName}</form:option>
</c:forEach> </c:forEach>
</form:select> </form:select>
</div>
<div class="pull-left" style="margin-right:0px;">
<form:select path="ipType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="ip_type"/></form:option>
<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div>
<div class="pull-left">
<c:set var = "condition_srcIp"><spring:message code="client_ip" /></c:set>
<form:input path="srcIp" placeholder="${condition_srcIp}" class="form-control input-small"/>
</div>
<div class="pull-left">
<c:set var = "condition_dstIp"><spring:message code="server_ip" /></c:set>
<form:input path="dstIp" placeholder="${condition_dstIp}" class="form-control input-small"/>
</div> </div>
<div class="pull-left" style="margin-right:0px;"> <div class="pull-left" style="margin-right:0px;">
<form:select path="protocol" class="selectpicker select2 input-small" > <form:select path="protocol" class="selectpicker select2 input-small" >
@@ -155,6 +130,23 @@
</c:forEach> </c:forEach>
</form:select> </form:select>
</div> </div>
<%-- <div class="pull-left" style="margin-right:0px;">
<form:select path="ipType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="ip_type"/></form:option>
<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div> --%>
<div class="pull-left">
<c:set var = "condition_srcIp"><spring:message code="client_ip" /></c:set>
<form:input path="srcIp" placeholder="${condition_srcIp}" class="form-control input-small"/>
</div>
<div class="pull-left">
<c:set var = "condition_dstIp"><spring:message code="server_ip" /></c:set>
<form:input path="dstIp" placeholder="${condition_dstIp}" class="form-control input-small"/>
</div>
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button> <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
@@ -164,6 +156,8 @@
<shiro:hasPermission name="specific:serviceIp:edit"> <shiro:hasPermission name="specific:serviceIp:edit">
<button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/specific/specificServiceHostCfg/form')"> <button type="button" class="btn btn-default" onclick="cmdEdit('${ctx}/specific/specificServiceHostCfg/form')">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button> <i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
</shiro:hasPermission>
<shiro:hasPermission name="specific:serviceIp:del">
<button type="button" class="btn btn-default" onclick="delAll()"> <button type="button" class="btn btn-default" onclick="delAll()">
<i class="fa fa-trash"></i><spring:message code="delete"/></button> <i class="fa fa-trash"></i><spring:message code="delete"/></button>
</shiro:hasPermission> </shiro:hasPermission>