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

(1)修复共用页面左上角显示配置类别

Browse Source 
(2)域名转发提交，与域名拦截复用页面
This commit is contained in:
wangxin
2018-06-23 14:34:27 +08:00
parent 02fc089f41
commit 3206972ee9
14 changed files with 219 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.configuration.AreaIpCfg;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.exceptions.MaatConvertException;
@@ -33,7 +32,8 @@ import com.nis.web.controller.BaseController;
public class IpController extends BaseController{
@RequestMapping(value = {"list"})
@RequiresPermissions(value={"iplist:config","iplist:audit"},logical=Logical.OR)
public String list(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
model.addAttribute("cfgName", cfgName);
cfg.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, cfg);
@@ -43,7 +43,8 @@ public class IpController extends BaseController{
}
@RequestMapping(value = {"form"})
@RequiresPermissions(value={"iplist:config"})
public String form(Model model,String ids,Integer functionId,BaseIpCfg entity) {
public String form(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) {
model.addAttribute("cfgName", cfgName);
if(StringUtils.isNotBlank(ids)){
entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
}
@@ -64,7 +65,8 @@ public class IpController extends BaseController{
return "/cfg/iplist/form";
}
@RequestMapping(value = {"saveOrUpdate"})
public String saveOrUpdate(RedirectAttributes model, IpPortCfg cfg) {
public String saveOrUpdate(String cfgName,RedirectAttributes model, IpPortCfg cfg) {
model.addAttribute("cfgName", cfgName);
Date date=new Date();
cfg.setTableName(IpPortCfg.getTablename());
logger.info("saveOrUpdateIp loaded");
@@ -89,7 +91,8 @@ public class IpController extends BaseController{
}
@RequestMapping(value = {"delete"})
@RequiresPermissions("iplist:config")
public String delete(String ids,String compileIds,Integer functionId,RedirectAttributes model) {
public String delete(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) {
model.addAttribute("cfgName", cfgName);
try{
ipCfgService.deleteIp(ids,compileIds,functionId.intValue());
addMessage(model,"delete_success");
@@ -101,7 +104,8 @@ public class IpController extends BaseController{
}
@RequestMapping(value = {"audit"})
// @RequiresPermissions("iplist:audit")
public String audit(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
public String audit(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
redirectAttributes.addAttribute("cfgName", cfgName);
try{
for(String id:ids.split(",")){
Long.parseLong(id);