diff --git a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java index 1bce2316c..7ecb69b8c 100644 --- a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java @@ -127,6 +127,14 @@ public class DnsIpCfg extends BaseEntity { */ private String lable; + private String cfgIds; + + public String getCfgIds() { + return cfgIds; + } + public void setCfgIds(String cfgIds) { + this.cfgIds = cfgIds; + } public Long getCfgId() { return cfgId; } diff --git a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java index 0550f0467..787806a96 100644 --- a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java @@ -58,6 +58,7 @@ public class DnsIpCfgController extends BaseController { dnsIpCfg.setIsValid(1); dnsIpCfg.setCreateTime(now); dnsIpCfg.setCreator(UserUtils.getUser()); + dnsIpCfg.setIsAudit(1); } else {//修改 dnsIpCfg.setEditor(UserUtils.getUser()); dnsIpCfg.setEditTime(now); @@ -70,19 +71,26 @@ public class DnsIpCfgController extends BaseController { } @RequestMapping("delete") - public String delete(Model model, String cfgIds, RedirectAttributes redirectAttributes) { + public String delete(Model model, HttpServletRequest request, + HttpServletResponse response, DnsIpCfg dnsIpCfg) { + String cfgIds = dnsIpCfg.getCfgIds(); if (!StringUtils.isEmpty(cfgIds)) { try { dnsIpCfgService.delete(cfgIds); - addMessage(redirectAttributes, "删除成功"); + addMessage(model, "删除成功"); } catch (Exception e) { e.printStackTrace(); - addMessage(redirectAttributes, "删除失败"); + addMessage(model, "删除失败"); } } else { - addMessage(redirectAttributes, "删除失败"); + addMessage(model, "删除失败"); } - return "redirect:" + adminPath + "/cfg/dnsIp/list"; + + Page page = dnsIpCfgService.findPage(new Page(request, response, 30), dnsIpCfg); + model.addAttribute("page", page); + + addRequestAndServiceDictToModel(model); + return "/cfg/dnsIpCfgList"; } private void addRequestAndServiceDictToModel(Model model) { diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index f465344f7..6494a753c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -65,11 +65,15 @@ if (checkboxes.length == 0) { alertx("请选择一条配置"); } else { - var ids; + var ids = ""; checkboxes.each(function(){ ids = ids + $(this).attr("id") + ","; }); - confirmx("", "${ctx}/cfg/dnsIp/delete?cfgIds=" + ids); + if (confirm("")) { + $("#cfgIds").val(ids); + $("#searchForm").attr("action","${ctx}/cfg/dnsIp/delete"); + $("#searchForm").submit(); + } } } @@ -99,6 +103,7 @@ +