From 86cf73fee4477dcb3c75a78f854e36715355dbe8 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 28 May 2018 10:18:03 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B0=83=E6=95=B4=E5=9C=A8controller?= =?UTF-8?q?=E5=B1=82=E9=81=8D=E5=8E=86=20=EF=BC=882=EF=BC=89jquert=20valid?= =?UTF-8?q?ate=E6=8F=92=E4=BB=B6=E8=B0=83=E6=95=B4=20=EF=BC=883=EF=BC=89IP?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95show=20more=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ntc/WhiteListController.java | 31 ++++++++++++- .../service/configuration/IpCfgService.java | 40 ++++++++++++++-- .../configuration/StringCfgService.java | 46 +++++++++++++++++++ .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 2 +- .../1.11.0/jquery.validate.method.js | 32 ++++++++++--- .../1.11.0/localization/messages_en.js | 9 +++- .../1.11.0/localization/messages_zh.js | 9 +++- 7 files changed, 153 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index e22b26477..a33f2f66a 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -1,6 +1,7 @@ package com.nis.web.controller.configuration.ntc; import java.util.Date; +import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,8 +20,13 @@ import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; +import com.nis.domain.maat.ToMaatResult; +import com.nis.exceptions.MaatConvertException; +import com.nis.util.ConfigServiceUtil; import com.nis.util.Constants; import com.nis.web.controller.BaseController; +import com.nis.web.dao.configuration.IpCfgDao; +import com.nis.web.dao.configuration.StringCfgDao; /** * 白名单 @@ -165,7 +171,19 @@ public class WhiteListController extends BaseController{ // @RequiresPermissions("whitelist:aduit") public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { try{ - ipCfgService.auditWhiteIp(ids, cfg); + for(String id:ids.split(",")){ + Long.parseLong(id); + } + List beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),ids); + Date date=new Date(); + for(BaseIpCfg bean:beans){ + bean.setTableName(IpPortCfg.getTablename()); + bean.setAuditorId(bean.getCurrentUser().getId()); + bean.setAuditTime(date); + bean.setIsAudit(cfg.getIsAudit()); + bean.setIsValid(cfg.getIsValid()); + ipCfgService.auditWhiteIp(bean); + } addMessage(redirectAttributes,"audit_success"); }catch(Exception e){ logger.error("审核失败", e); @@ -177,7 +195,16 @@ public class WhiteListController extends BaseController{ // @RequiresPermissions("whitelist:aduit") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { try{ - stringCfgService.auditWhiteDomain(ids, cfg); + List beans=stringCfgService.getListByCfgId(HttpUrlCfg.getTablename(),ids); + Date date=new Date(); + for(BaseStringCfg bean:beans){ + bean.setTableName(IpPortCfg.getTablename()); + bean.setAuditorId(bean.getCurrentUser().getId()); + bean.setAuditTime(date); + bean.setIsAudit(cfg.getIsAudit()); + bean.setIsValid(cfg.getIsValid()); + stringCfgService.auditWhiteDomain(cfg); + } addMessage(redirectAttributes,"audit_success"); }catch(Exception e){ logger.error("审核失败", e); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index a56da52aa..6d97f791f 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -90,10 +90,42 @@ public class IpCfgService extends CrudService { } return ipCfgDao.update(baseIpCfg); } - public void auditWhiteIp(String ids,IpPortCfg cfg) throws Exception{ - for(String id:ids.split(",")){ - Long.parseLong(id); + public void auditWhiteIp(BaseIpCfg cfg) throws Exception{ + List beans=new ArrayList<>(); + beans.add(cfg); + this.auditBatch(beans, IpCfgDao.class); + if(cfg.getIsAudit()==1){ + //待调整 + + //调用服务接口下发配置数据 + String json=gsonToJson(beans); + logger.info("IP白名单下发配置参数："+json); + //调用服务接口下发配置 + try { + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("IP白名单配置下发响应信息："+result.getMsg()); + } catch (Exception e) { + e.printStackTrace(); + logger.info("IP白名单配置下发失败"); + throw new MaatConvertException(":"+e.getMessage()); + } + }else if(cfg.getIsAudit()==3){ + //调用服务接口取消配置 + String json=gsonToJson(beans); + logger.info("IP白名单配置参数："+json); + //调用服务接口取消配置 + try { + ToMaatResult result = ConfigServiceUtil.put(json, 2); + logger.info("IP白名单取消配置响应信息："+result.getMsg()); + } catch (Exception e) { + e.printStackTrace(); + logger.info("IP白名单取消配置失败"); + throw new MaatConvertException(":"+e.getMessage()); + } } + } + public void auditWhiteIp(String ids,IpPortCfg cfg) throws Exception{ + List beans=this.getListByCfgId(IpPortCfg.getTablename(),ids); Date date=new Date(); for(BaseIpCfg bean:beans){ @@ -105,6 +137,8 @@ public class IpCfgService extends CrudService { } this.auditBatch(beans, IpCfgDao.class); if(cfg.getIsAudit()==1){ + //待调整 + //调用服务接口下发配置数据 String json=gsonToJson(beans); logger.info("IP白名单下发配置参数："+json); diff --git a/src/main/java/com/nis/web/service/configuration/StringCfgService.java b/src/main/java/com/nis/web/service/configuration/StringCfgService.java index cdd305ed2..7759a5976 100644 --- a/src/main/java/com/nis/web/service/configuration/StringCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/StringCfgService.java @@ -89,6 +89,38 @@ public class StringCfgService extends CrudService { } return stringCfgDao.update(baseStringCfg); } + public void auditWhiteDomain(BaseStringCfg cfg) throws Exception{ + List beans=new ArrayList<>(); + beans.add(cfg); + this.auditBatch(beans, StringCfgDao.class); + if(cfg.getIsAudit()==1){ + //调用服务接口下发配置数据 + String json=gsonToJson(beans); + logger.info("文件样例下发配置参数："+json); + //调用服务接口下发配置 + try { + ToMaatResult result = ConfigServiceUtil.postMaatCfg(json); + logger.info("IP白名单配置下发响应信息："+result.getMsg()); + } catch (Exception e) { + e.printStackTrace(); + logger.info("IP白名单配置下发失败"); + throw new MaatConvertException(":"+e.getMessage()); + } + }else if(cfg.getIsAudit()==3){ + //调用服务接口取消配置 + String json=gsonToJson(beans); + logger.info("IP白名单配置参数："+json); + //调用服务接口取消配置 + try { + ToMaatResult result = ConfigServiceUtil.put(json, 2); + logger.info("IP白名单取消配置响应信息："+result.getMsg()); + } catch (Exception e) { + e.printStackTrace(); + logger.info("IP白名单取消配置失败"); + throw new MaatConvertException(":"+e.getMessage()); + } + } + } public void auditWhiteDomain(String ids,HttpUrlCfg cfg) throws Exception{ for(String id:ids.split(",")){ Long.parseLong(id); @@ -241,4 +273,18 @@ public class StringCfgService extends CrudService { // TODO Auto-generated method stub return stringCfgDao.getListByCompileId(tableName,ids); } + /** + * getListByCfgId(这里用一句话描述这个方法的作用) + * (这里描述这个方法适用条件 – 可选) + * @param tablename + * @param ids + * @return + *List + * @exception + * @since 1.0.0 + */ + public List getListByCfgId(String tableName, String ids) { + // TODO Auto-generated method stub + return stringCfgDao.getListByCfgId(tableName, ids); + } } diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp index 410f640fc..e4bc8b87e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -171,7 +171,7 @@ $(function(){ -