From 262087ecf0fc3dd3568145b0e0cff69415d4e56f Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 24 May 2018 19:33:59 +0800 Subject: [PATCH] =?UTF-8?q?(1)getList=E6=96=B9=E6=B3=95=E6=94=B9=E5=90=8D?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E5=85=88=E7=89=88=E6=9C=AC=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=BC=96=E8=AF=91ID=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=97=E8=A1=A8=EF=BC=8C=E8=BF=99=E9=87=8C?= =?UTF-8?q?=E6=94=B9=E6=88=90=E4=B8=A4=E4=B8=AA=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?getListByCfgId=E5=92=8CgetListByCompileId=20(2)=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=90=8E=E5=8F=B0=E8=BF=94=E5=9B=9E=E7=BB=99=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=20(3)?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=A0=E5=A4=84functionId=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BC=A0=E9=80=92=E7=9A=84bug=20(4)nis.properties?= =?UTF-8?q?=E8=B0=83=E6=95=B4url=20(5)=E7=99=BD=E5=90=8D=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8F=90=E4=BA=A4=20(6)=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E6=8E=89CrudService=E7=9A=84sendTomaat=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=AE=9E=E7=8E=B0=EF=BC=8C=E5=9C=A8=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B2=A1=E6=9C=89=E7=94=A8=E5=88=B0=E8=AF=A5?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=B6=E5=88=A0=E9=99=A4=E8=AF=A5=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/IpCfgController.java | 4 +- .../configuration/StringCfgController.java | 4 +- .../ntc/WhiteListController.java | 95 ++-- .../nis/web/dao/configuration/IpCfgDao.java | 3 +- .../nis/web/dao/configuration/IpCfgDao.xml | 10 + .../web/dao/configuration/StringCfgDao.java | 3 +- .../web/dao/configuration/StringCfgDao.xml | 7 +- .../java/com/nis/web/service/CrudService.java | 438 +----------------- .../ComplexStringCfgService.java | 40 +- .../service/configuration/IpCfgService.java | 110 ++++- .../configuration/MultipleCfgService.java | 32 +- .../configuration/StringCfgService.java | 111 ++++- src/main/resources/nis.properties | 4 +- .../views/cfg/whitelist/domainList.jsp | 5 +- .../WEB-INF/views/cfg/whitelist/ipForm.jsp | 4 +- .../WEB-INF/views/cfg/whitelist/ipList.jsp | 13 +- 16 files changed, 308 insertions(+), 575 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index 4f0e63a8a..4c4ea23d2 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -239,7 +239,7 @@ public class IpCfgController extends BaseController{ maatTable=serviceConfigInfo.getMaatTable(); } if(StringUtils.isNotBlank(ids)){ - List beans=ipCfgService.getList(tableName,ids); + List beans=ipCfgService.getListByComileId(tableName,ids); List auditBeans=new ArrayList<>(); List auditAreaBeans=new ArrayList<>(); Date date=new Date(); @@ -284,7 +284,7 @@ public class IpCfgController extends BaseController{ } auditBeans.add(auditBean); } - ipCfgService.auditIpCfg(isAudit,auditBeans,auditAreaBeans,beans); +// ipCfgService.auditIpCfg(isAudit,auditBeans,auditAreaBeans,beans); } addMessage(model,"audit_success"); }catch(Exception e){ diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index c8ddd1583..784ad7f00 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -220,7 +220,7 @@ public class StringCfgController extends BaseController{ maatTable=serviceConfigInfo.getMaatTable(); } if(StringUtils.isNotBlank(ids)){ - List beans=stringCfgService.getList(tableName,ids); + List beans=stringCfgService.getListByCompileId(tableName,ids); List auditBeans=new ArrayList<>(); List auditAreaBeans=new ArrayList<>(); Date date=new Date(); @@ -265,7 +265,7 @@ public class StringCfgController extends BaseController{ } auditBeans.add(auditBean); } - stringCfgService.auditStringCfg(isAudit,auditBeans,auditAreaBeans,beans); +// stringCfgService.auditStringCfg(isAudit,auditBeans,auditAreaBeans,beans); } addMessage(model,"audit_success"); }catch (Exception e) { 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 bc8dd7324..6b1c57367 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,8 +1,6 @@ package com.nis.web.controller.configuration.ntc; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -14,17 +12,15 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; 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.BaseIpCfg; import com.nis.domain.configuration.BaseStringCfg; -import com.nis.domain.configuration.DnsDomainCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; -import com.nis.main.ConvertTool; import com.nis.util.Constants; import com.nis.web.controller.BaseController; -import com.nis.web.dao.configuration.StringCfgDao; /** * 白名单 @@ -92,14 +88,10 @@ public class WhiteListController extends BaseController{ return "/cfg/whitelist/domainForm"; } @RequestMapping(value = {"saveOrUpdateIp"}) - public String saveOrUpdateIp(Model model, IpPortCfg cfg) { + public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) { cfg.setTableName(IpPortCfg.getTablename()); logger.info("saveOrUpdateIp loaded"); try{ - if(cfg.getCompileId()==null){ - int compileId=0; - cfg.setCompileId(compileId); - } Date date=new Date(); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); @@ -120,14 +112,10 @@ public class WhiteListController extends BaseController{ return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId(); } @RequestMapping(value = {"saveOrUpdateDomain"}) - public String saveOrUpdateDomain(Model model, HttpUrlCfg cfg) { + public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) { cfg.setTableName(HttpUrlCfg.getTablename()); logger.info("saveOrUpdateIp loaded"); try{ - if(cfg.getCompileId()==null){ - int compileId=0; - cfg.setCompileId(compileId); - } Date date=new Date(); cfg.setIsValid(Constants.VALID_NO); cfg.setIsAudit(Constants.AUDIT_NOT_YET); @@ -150,24 +138,9 @@ public class WhiteListController extends BaseController{ @RequestMapping(value = {"deleteIp"}) @RequiresPermissions("whitelist:config") - public String deleteIp(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model) { + public String deleteIp(String ids,Integer functionId,RedirectAttributes model) { try{ - List ipCfgs=new ArrayList(); - Date date =new Date(); - if(StringUtils.isNotBlank(ids)){ - for(String idStr:ids.split(",")){ - if(StringUtils.isNotBlank(idStr)){ - BaseIpCfg cfg=new BaseIpCfg(); - cfg.setCfgId(Long.parseLong(idStr)); - cfg.setTableName(IpPortCfg.getTablename()); - cfg.setEditorId(cfg.getCurrentUser().getId()); - cfg.setEditTime(date); - cfg.setIsValid(Constants.VALID_DEL); - ipCfgs.add(cfg); - } - } - } - ipCfgService.deleteIpCfg(ipCfgs,null); + ipCfgService.deleteWhiteIp(ids); addMessage(model,"delete_success"); }catch(Exception e){ logger.error("删除失败", e); @@ -177,24 +150,9 @@ public class WhiteListController extends BaseController{ } @RequestMapping(value = {"deleteDomain"}) @RequiresPermissions("whitelist:config") - public String deleteDomain(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model) { + public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) { try{ - List cfgs=new ArrayList(); - Date date =new Date(); - if(StringUtils.isNotBlank(ids)){ - for(String idStr:ids.split(",")){ - if(StringUtils.isNotBlank(idStr)){ - BaseStringCfg cfg=new BaseStringCfg(); - cfg.setCfgId(Long.parseLong(idStr)); - cfg.setTableName(HttpUrlCfg.getTablename()); - cfg.setEditorId(cfg.getCurrentUser().getId()); - cfg.setEditTime(date); - cfg.setIsValid(Constants.VALID_DEL); - cfgs.add(cfg); - } - } - } - stringCfgService.deleteBatch(cfgs, StringCfgDao.class); + stringCfgService.deleteWhiteDomain(ids); addMessage(model,"delete_success"); }catch(Exception e){ logger.error("删除失败", e); @@ -202,23 +160,28 @@ public class WhiteListController extends BaseController{ } return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+functionId; } - /** - * - * getCompileId(获取编译ID) - * (这里描述这个方法适用条件 – 可选) - * @return - *long - * @exception - * @since 1.0.0 - */ - protected long getCompileId(BaseIpCfg cfg){ - long compileId=0l; - try { - compileId = cfg.getCompileId()==null?new ConvertTool().getCompileId():cfg.getCompileId(); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + @RequestMapping(value = {"auditIp"}) +// @RequiresPermissions("whitelist:aduit") + public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) { + try{ + ipCfgService.auditWhiteIp(ids, cfg); + addMessage(redirectAttributes,"audit_success"); + }catch(Exception e){ + logger.error("审核失败", e); + addMessage(redirectAttributes, "audit_failed"); } - return compileId; + return "redirect:" + adminPath +"/ntc/whitelist/ipList?functionId="+cfg.getFunctionId(); + } + @RequestMapping(value = {"auditDomain"}) +// @RequiresPermissions("whitelist:aduit") + public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { + try{ + stringCfgService.auditWhiteDomain(ids, cfg); + addMessage(redirectAttributes,"audit_success"); + }catch(Exception e){ + logger.error("审核失败", e); + addMessage(redirectAttributes, "audit_failed"); + } + return "redirect:" + adminPath +"/ntc/whitelist/domainList?functionId="+cfg.getFunctionId(); } } diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java index dee190703..ab7e83b4d 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java @@ -18,7 +18,8 @@ public interface IpCfgDao extends CrudDao{ public BaseIpCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; public BaseIpCfg get(BaseIpCfg entity) ; public List findList(BaseIpCfg entity) ; - public List getList(@Param("tableName")String tableName,@Param("ids")String ids) ; + public List getListByCfgId(@Param("tableName")String tableName,@Param("ids")String ids) ; + public List getListByComileId(@Param("tableName")String tableName,@Param("ids")String ids) ; public int insert(BaseIpCfg entity) ; public int update(BaseIpCfg entity) ; public int updateValid(BaseIpCfg entity) ; diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 57926a5aa..032759933 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -114,6 +114,16 @@ AND IS_VALID!=-1 + + - SELECT FROM ${tableName} WHERE IS_VALID!=-1 AND COMPILE_ID in (${ids}) + + - + @@ -194,6 +194,7 @@
+ 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 a3ad6382b..a3d8d05f5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp @@ -138,7 +138,7 @@ $(function(){
@@ -150,7 +150,7 @@ $(function(){
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp index 49068bcea..6efc86779 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -120,19 +120,19 @@
- - + + - +
    -
    • -
    • -
    • +
    • +
    • +
@@ -202,6 +202,7 @@
+