From 429398789d2a20583b049c7e5408062c7b53c549 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 10:31:18 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 4 ++-- .../configuration/ComplexStringCfgController.java | 2 +- .../nis/web/controller/configuration/IpCfgController.java | 7 ++++--- .../nis/web/controller/configuration/NumCfgController.java | 2 +- .../web/controller/configuration/StringCfgController.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index dd560e564..f38414a09 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -26,6 +26,8 @@ import com.nis.web.service.OfficeService; import com.nis.web.service.RoleService; import com.nis.web.service.SystemService; import com.nis.web.service.UserService; +import com.nis.web.service.basics.ServiceDictInfoService; +import com.nis.web.service.basics.SysDictInfoService; import com.nis.web.service.configuration.AppCfgService; import com.nis.web.service.configuration.ComplexStringCfgService; import com.nis.web.service.configuration.FtpCfgService; @@ -34,10 +36,8 @@ import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.MediaCfgService; import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.RequestInfoService; -import com.nis.web.service.configuration.ServiceDictInfoService; import com.nis.web.service.configuration.SslCfgService; import com.nis.web.service.configuration.StringCfgService; -import com.nis.web.service.configuration.SysDictInfoService; import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.WebCfgService; import com.nis.web.service.systemService.ServiceConfigInfoService; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index e88634671..3ff4618c0 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.ComplexkeywordCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; 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 948960738..b7dbb7414 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; -import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; @@ -41,8 +41,9 @@ public class IpCfgController extends BaseController{ } @RequestMapping(value = {"list"}) - public String ipCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { + public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); + model.addAttribute("audit", audit); if(ipCfg!=null){ Integer serviceId=ipCfg.getServiceId(); logger.info("servcice id is "+serviceId); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 59fc12b10..32ad4c922 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; 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 5cba63859..e788bd1ee 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -17,7 +17,7 @@ import com.nis.domain.ServiceConfigInfo; import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.RequestInfo; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.web.controller.BaseController; From 0276fb3828bdcb11b1e756ea5ed7e0e4bc6bd65a Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 10:31:59 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f38414a09..a0266aa58 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1,5 +1,4 @@ package com.nis.web.controller; - import java.beans.PropertyEditorSupport; import java.io.IOException; import java.util.Date; From e59384fd3215120cad153381738681d9d3d76cca Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 10:32:25 +0800 Subject: [PATCH 03/32] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index a0266aa58..f38414a09 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1,4 +1,5 @@ package com.nis.web.controller; + import java.beans.PropertyEditorSupport; import java.io.IOException; import java.util.Date; From 90bfc9c3626605760b49798d67e54919e601c242 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 10:36:45 +0800 Subject: [PATCH 04/32] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/configuration/IpCfgController.java | 1 - 1 file changed, 1 deletion(-) 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 b7dbb7414..6a16f3cf5 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; From b4fe1c5fe01b4ce1b4374b87ee0f12e928b097b3 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 10:38:44 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/web/controller/BaseController.java | 1 - .../web/controller/configuration/ComplexStringCfgController.java | 1 - .../com/nis/web/controller/configuration/IpCfgController.java | 1 + .../com/nis/web/controller/configuration/NumCfgController.java | 1 - .../nis/web/controller/configuration/StringCfgController.java | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index f38414a09..a0266aa58 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -1,5 +1,4 @@ package com.nis.web.controller; - import java.beans.PropertyEditorSupport; import java.io.IOException; import java.util.Date; diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 3ff4618c0..939f89beb 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; 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 6a16f3cf5..b7dbb7414 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -1,4 +1,5 @@ package com.nis.web.controller.configuration; + import java.util.Date; import java.util.List; diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 32ad4c922..433014a88 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; 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 e788bd1ee..34d23207f 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -1,5 +1,4 @@ package com.nis.web.controller.configuration; - import java.util.Date; import java.util.List; From d9bcc2f1c7866f673607afdcbf0c9c91d8081b8f Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 14:15:06 +0800 Subject: [PATCH 06/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 4 ++++ src/main/resources/messages/message_ru.properties | 4 ++++ src/main/resources/messages/message_zh_CN.properties | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index e88811496..8595d995d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -142,6 +142,10 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +save_success=save success +save_failed=save failed +delete_success=delete success +delete_failed=delete failed #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index e706d890d..62fd50af2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -142,6 +142,10 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +save_success=save success +save_failed=save failed +delete_success=delete success +delete_failed=delete failed #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index e8cb48922..621805127 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -140,7 +140,11 @@ date_list=\u6570\u636e\u5217\u8868 confirm_message=\u786e\u5b9a\u5417\uff1f fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 - +loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5. +save_success=\u4fdd\u5b58\u6210\u529f +save_failed=\u4fdd\u5b58\u5931\u8d25 +delete_success=\u5220\u9664\u6210\u529f +delete_failed=\u5220\u9664\u5931\u8d25 #==========message end===================== #==========yewuliexingguanli begin===================== From e1c6e8fd92a7459d65600cfacedc36867e1a3739 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 14:24:39 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 1 + src/main/resources/messages/message_ru.properties | 1 + src/main/resources/messages/message_zh_CN.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8595d995d..15f8935b9 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -146,6 +146,7 @@ save_success=save success save_failed=save failed delete_success=delete success delete_failed=delete failed +turning_page=It is turning to the page #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 62fd50af2..deae46fb2 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -146,6 +146,7 @@ save_success=save success save_failed=save failed delete_success=delete success delete_failed=delete failed +turning_page=It is turning to the page #==========message end===================== #==========yewuliexingguanli begin===================== diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 621805127..27ecad3b5 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -145,6 +145,7 @@ save_success=\u4fdd\u5b58\u6210\u529f save_failed=\u4fdd\u5b58\u5931\u8d25 delete_success=\u5220\u9664\u6210\u529f delete_failed=\u5220\u9664\u5931\u8d25 +turning_page=\u6b63\u5728\u4e3a\u60a8\u8df3\u8f6c\u9875\u9762 #==========message end===================== #==========yewuliexingguanli begin===================== From 7ff672d46764cc086f76717b3e8aeb64905e5d63 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 6 Mar 2018 14:44:34 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/Page.java | 219 ++++++------------------- 1 file changed, 49 insertions(+), 170 deletions(-) diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index a3ad883d3..0586434ac 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -4,7 +4,7 @@ package com.nis.domain; import java.util.ArrayList; -import java.util.HashMap; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -13,16 +13,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.mapping.ResultMap; -import org.apache.ibatis.mapping.ResultMapping; -import org.apache.ibatis.session.SqlSessionFactory; import com.fasterxml.jackson.annotation.JsonIgnore; import com.nis.util.Configurations; -import com.nis.util.Constants; import com.nis.util.CookieUtil; import com.nis.util.StringUtil; -import com.nis.web.service.SpringContextHolder; /** * 分页类 @@ -52,7 +47,7 @@ public class Page { private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc - private String fields ="";//制定资源的字段 + private String fields;//制定资源的字段 private String where; @@ -63,10 +58,9 @@ public class Page { private String message = ""; // 设置提示消息，显示在“共n条”之后 public Page() { - this.pageSize = pageSize; + this.pageSize = -1; } - /** * 构造方法 * @param request 传递 repage 参数，来记住页码 @@ -74,27 +68,11 @@ public class Page { */ public Page(HttpServletRequest request, HttpServletResponse response){ - this(request, response,Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); - - } - /** - * 构造方法 - * @param request 传递 repage 参数，来记住页码 - * @param response 用于设置 Cookie，记住页码 - * - */ - public Page(HttpServletRequest request, HttpServletResponse response,Class clazz){ - - this(request, response,clazz.getSimpleName(),Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); - - } - public Page(HttpServletRequest request, HttpServletResponse response,int defaultPageSize){ - - this(request, response,"",Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); + this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30))); } - public Page(HttpServletRequest request, HttpServletResponse response,String className, int defaultPageSize){ + public Page(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){ try { // 设置页码参数（传递repage参数，来记住页码） String no = request.getParameter("pageNo"); @@ -111,7 +89,13 @@ public class Page { } // 设置页面大小参数（传递repage参数，来记住页码大小） - String size = request.getParameter("pageSize"); + String size = ""; + if(defaultPageSize==-1){ + size = "-1"; + }else{ + size = request.getParameter("pageSize"); + + } if (StringUtils.isNotBlank(size)) { if (StringUtils.isNumeric(size) || size.equals("-1")){ @@ -126,24 +110,20 @@ public class Page { } else { this.pageSize = defaultPageSize; } - //超出每页最大显示条数，取限制的最大条数 - if(this.pageSize > Constants.MAX_PAGE_SIZE){ - this.pageSize = Constants.MAX_PAGE_SIZE; - } String fields = request.getParameter("fields"); if (StringUtils.isNotBlank(fields)){ - fields=getFiledsSql(className, fields); this.setFields(fields); } // 设置排序参数 String orderBy = request.getParameter("orderBy"); if (StringUtils.isNotBlank(orderBy)){ - orderBy=getOrderBySql(className, orderBy); this.setOrderBy(orderBy); } - this.count=Integer.valueOf(Configurations.getIntProperty("page.count", -1)); + + this.setWhere(getWhere(request)); + } catch (Exception e) { e.printStackTrace(); @@ -334,8 +314,8 @@ public class Page { sb.append("
  • 当前 "); sb.append(" / "); - sb.append(" 条，"); + sb.append(" 页，"); sb.append("共 " + count + " 条"+(message!=null?message:"")+"
    • \n"); sb.insert(0,"
      \n").append("
    \n"); @@ -643,138 +623,37 @@ public class Page { public int getMaxResults(){ return getPageSize(); } - /** - * @Title: getFiledsSql - * @Description: 将fields的属性名称替换为字段名称 - * @param @param mapName - * @param @param fileds - * @param @return - * @param @throws Exception - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @JsonIgnore - public String getFiledsSql(String mapName,String fileds) throws Exception{ - String[] fieldsColoumn=null; - String orderByStr=""; - //所有字段名 - List columnList=new ArrayList(); - //所有属性名 - List propertyList=new ArrayList(); - //属性名称为key，字段名称为value - Map columnMap=new HashMap(); - - if(!StringUtil.isBlank(fileds)){ - //解析Fileds的字段/属性名称 - fieldsColoumn=fileds.split(","); - - //从resultMap中获取字段名称和属性名称 - if(fieldsColoumn != null){ - SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map"); - List mapping= map.getResultMappings(); - for(ResultMapping mapp:mapping){ - columnList.add(mapp.getColumn().toLowerCase()); - propertyList.add(mapp.getProperty()); - columnMap.put(mapp.getProperty(), mapp.getColumn()); - } - } - if(fieldsColoumn != null){ - fileds=""; - for (String column : fieldsColoumn) { - if(!StringUtil.isBlank(column)){ - column=column.trim(); - if(columnList.contains(column.toLowerCase())){ - fileds+=","+column; - }else if(propertyList.contains(column)){ - fileds+=","+columnMap.get(column).toString(); - } - } - } - if(!StringUtil.isBlank(fileds)){ - fileds=fileds.substring(1); - } - - } - - } - return fileds; - } - /** - * @Title: getOrderBySql - * @Description: 将orderBy的属性名称替换为字段名称 - * @param @param mapName - * @param @param orderBy - * @param @return - * @param @throws Exception - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - @JsonIgnore - public static String getOrderBySql(String mapName,String orderBy) throws Exception{ - String[] orderByColoumn=null; - //所有字段名 - List columnList=new ArrayList(); - //所有属性名 - List propertyList=new ArrayList(); - Map columnMap=new HashMap(); - - if(!StringUtil.isBlank(orderBy)){ - //解析orderBy的字段/属性名称 - orderByColoumn=orderBy.split(","); - //从resultMap中获取字段名称和属性名称 - if(orderByColoumn != null){ - SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - ResultMap map= sqlSessionFactory.getConfiguration().getResultMap(mapName+"Map"); - List mapping= map.getResultMappings(); - for(ResultMapping mapp:mapping){ - columnList.add(mapp.getColumn().toLowerCase()); - propertyList.add(mapp.getProperty()); - columnMap.put(mapp.getProperty(), mapp.getColumn()); - } - } - if(orderByColoumn != null){ - orderBy=""; - for (String column : orderByColoumn) { - if(!StringUtil.isBlank(column)){ - if(columnList.contains(replaceOrderBy(column))){ - orderBy+=","+column; - }else if(propertyList.contains(replaceOrderBy(column))){ - //如果是实体类名字则获取对应数据库名字+排序方式 - orderBy+=","+columnMap.get(replaceOrderBy(column)).toString() - +column.replace(replaceOrderBy(column), ""); - } - } - } - if(!StringUtil.isBlank(orderBy)){ - orderBy=orderBy.substring(1); - } - } - - } - return orderBy; - } - /** - * @Title: replaceOrderBy - * @Description: 去掉orderBy中的desc和asc - * @param @param str - * @param @return - * @return Map 返回类型 - * @author （DDM） - * @version V1.0 - */ - public static String replaceOrderBy(String str){ - if(!StringUtil.isBlank(str)){ - str=str.trim(); - str=str.replace(" asc",""); - str=str.replace(" ASC",""); - str=str.replace(" DESC",""); - str=str.replace(" desc",""); - str=str.trim(); - } - return str; - } +// /** +// * 获取 Spring data JPA 分页对象 +// */ +// public Pageable getSpringPage(){ +// List orders = new ArrayList(); +// if (orderBy!=null){ +// for (String order : StringUtils.split(orderBy, ",")){ +// String[] o = StringUtils.split(order, " "); +// if (o.length==1){ +// orders.add(new Order(Direction.ASC, o[0])); +// }else if (o.length==2){ +// if ("DESC".equals(o[1].toUpperCase())){ +// orders.add(new Order(Direction.DESC, o[0])); +// }else{ +// orders.add(new Order(Direction.ASC, o[0])); +// } +// } +// } +// } +// return new PageRequest(this.pageNo - 1, this.pageSize, new Sort(orders)); +// } +// +// /** +// * 设置 Spring data JPA 分页对象，转换为本系统分页对象 +// */ +// public void setSpringPage(org.springframework.data.domain.Page page){ +// this.pageNo = page.getNumber(); +// this.pageSize = page.getSize(); +// this.count = page.getTotalElements(); +// this.list = page.getContent(); +// } + } From c2aa0ff7250794d216535318514658a5d5fa5182 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Tue, 6 Mar 2018 16:56:19 +0800 Subject: [PATCH 09/32] =?UTF-8?q?1.=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=8B=E9=82=AE=E4=BB=B6=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E3=80=8B=E6=94=B6=E4=BB=B6=E4=BA=BA=E7=AE=A1=E6=8E=A7=20?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/FormAuthenticationFilter.java | 4 +- .../resources/messages/message_en.properties | 35 ++++++- .../messages/message_zh_CN.properties | 34 ++++++- .../WEB-INF/views/cfg/complexCfgForm.jsp | 6 +- .../WEB-INF/views/cfg/complexCfgList.jsp | 94 +++++++++---------- src/main/webapp/WEB-INF/views/login.jsp | 2 +- 6 files changed, 120 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java b/src/main/java/com/nis/web/security/FormAuthenticationFilter.java index cbe2f0d8d..b6f2c326f 100644 --- a/src/main/java/com/nis/web/security/FormAuthenticationFilter.java +++ b/src/main/java/com/nis/web/security/FormAuthenticationFilter.java @@ -74,14 +74,14 @@ public class FormAuthenticationFilter extends org.apache.shiro.web.filter.authc. String className = e.getClass().getName(), message = ""; if (IncorrectCredentialsException.class.getName().equals(className) || UnknownAccountException.class.getName().equals(className)){ - message = "用户或密码错误, 请重试."; + message = "loginName_error"; } else if (e.getMessage() != null && StringUtils.startsWith(e.getMessage(), "msg:")){ message = StringUtils.replace(e.getMessage(), "msg:", ""); } else{ - message = "系统出现点问题，请稍后再试！"; + message = "system_error"; e.printStackTrace(); // 输出到控制台 } request.setAttribute(getFailureKeyAttribute(), className); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 15f8935b9..4d6ce538f 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -142,6 +142,8 @@ date_list=Date List confirm_message=Are you sure? fill_loginName=Please fill in the loginName fill_loginPassWord=Please fill in the passWord +loginName_error=loginName and password error,please try again. +system_error=system error,please try again later! save_success=save success save_failed=save failed delete_success=delete success @@ -178,4 +180,35 @@ datebase_table=datebase table fill_all=fill in all describe=describe back=back -#==========yewuliexingguanli end===================== \ No newline at end of file +#==========yewuliexingguanli end===================== + +#==========youjianguankong begin===================== +sort=sort +createTime_asc=order by createTime asc +createTime_desc=order by createTime desc +editTime_asc=order by editTime asc +editTime_desc=order by editTime desc +auditTime_asc=order by auditTime asc +auditTime_desc=order by auditTime desc +config_describe=configuration description +match_area=matching area +key_word=key word +block_type=block type +letter=letter +whether_area_block=whether area block +label=label +property=property +valid_identifier=valid identifier +is_audit=whether audit +creator=creator +config_time=configuration time +editor=editor +edit_time=edit time +auditor=auditor +audit_time=audit time +yes=yes +no=no +deleted=deleted +cancel_approved=cancel approved + +#==========youjianguankong end===================== \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 27ecad3b5..d0023c77d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -141,6 +141,7 @@ confirm_message=\u786e\u5b9a\u5417\uff1f fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7 fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801 loginName_error=\u7528\u6237\u6216\u5bc6\u7801\u9519\u8bef, \u8bf7\u91cd\u8bd5. +system_error=\u7cfb\u7edf\u51fa\u73b0\u70b9\u95ee\u9898\uff0c\u8bf7\u7a0d\u540e\u518d\u8bd5\uff01 save_success=\u4fdd\u5b58\u6210\u529f save_failed=\u4fdd\u5b58\u5931\u8d25 delete_success=\u5220\u9664\u6210\u529f @@ -177,4 +178,35 @@ datebase_table=\u6570\u636e\u5e93\u8868 fill_all=\u8bf7\u586b\u5199\u6240\u6709\u5b57\u6bb5 describe=\u63cf\u8ff0 back=\u8fd4\u56de -#==========yewuliexingguanli end===================== \ No newline at end of file +#==========yewuliexingguanli end===================== + +#==========youjianguankong begin===================== +sort=\u6392\u5e8f +createTime_asc=\u6309\u521b\u5efa\u65f6\u95f4\u987a\u5e8f +createTime_desc=\u6309\u521b\u5efa\u65f6\u95f4\u5012\u5e8f +editTime_asc=\u6309\u4fee\u6539\u65f6\u95f4\u987a\u5e8f +editTime_desc=\u6309\u4fee\u6539\u65f6\u95f4\u5012\u5e8f +auditTime_asc=\u6309\u5ba1\u6838\u65f6\u95f4\u987a\u5e8f +auditTime_desc=\u6309\u5ba1\u6838\u65f6\u95f4\u5012\u5e8f +config_describe=\u914d\u7f6e\u63cf\u8ff0 +match_area=\u5339\u914d\u533a\u57df +key_word=\u5173\u952e\u5b57 +block_type=\u7ba1\u63a7\u7c7b\u578b +letter=\u6765\u51fd +whither_area_block=\u662f\u5426\u533a\u57df\u7ba1\u63a7 +label=\u6807\u7b7e +property=\u6027\u8d28 +valid_identifier=\u6709\u6548\u6807\u8bc6 +is_audit=\u662f\u5426\u5ba1\u6838 +creator=\u521b\u5efa\u4eba\u5458 +config_time=\u914d\u7f6e\u65f6\u95f4 +editor=\u4fee\u6539\u4eba\u5458 +edit_time=\u4fee\u6539\u65f6\u95f4 +auditor=\u5ba1\u6838\u4eba\u5458 +audit_time=\u5ba1\u6838\u65f6\u95f4 +yes=\u662f +no=\u5426 +deleted=\u5df2\u5220\u9664 +cancel_approved=\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7 + +#==========youjianguankong end===================== \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index eee7dcd4f..123ebd499 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -31,7 +31,7 @@ $(function(){
    - +
    - 来函 + - 是否区域管控 - 分类 - 性质 - 标签 + + + + - 有效标识 - 是否审核 - 创建人员 - 配置时间 - 修改人员 - 修改时间 - 审核人员 - 审核时间 + + + + + + + + @@ -120,19 +120,19 @@ ${cfg.district } ${cfg.keywords } - 阻断 - 监测 - 封堵白名单 - 监测白名单 - 封堵监测白名单 - 灰名单 + + + + + + <%-- ${cfg.serviceId } --%> ${cfg.requestName } <%-- ${cfg.compileId } --%> - 否 - 是 + + @@ -160,16 +160,16 @@ <%-- ${cfg.areaEffectiveIds } --%> - 否 - 是 - 已删除 + + + - + ${cfg.creatorName } diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index ef0916973..4ed96b8f1 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -80,7 +80,7 @@

    ERROR:   - +

    From 3bf9b9ec118df62803de8375e2766058ef9b2b66 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 18:11:34 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/complexCfgList.jsp | 108 ++++++++++-------- 1 file changed, 61 insertions(+), 47 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 46fd5ccb1..c81b6c1a4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -5,6 +5,20 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -78,7 +193,7 @@ $(function(){
    - +
    - 管控类型 + - 来函 + - 是否区域管控 - 分类 - 性质 - 标签 + + + + - 有效标识 - 是否审核 - 创建人员 - 配置时间 - 修改人员 - 修改时间 - 审核人员 - 审核时间 + + + + + + + + + + + + @@ -137,22 +160,26 @@ ${ipCfg.dstPort } ${ipCfg.dstPortMask } ${ipCfg.direction } - ${ipCfg.protocol } + + 任意 + TCP + UDP + <%-- ${ipCfg.protocolId } --%> - 阻断 - 监测 - 封堵白名单 - 监测白名单 - 封堵监测白名单 - 灰名单 + + + + + + <%-- ${ipCfg.serviceId } --%> ${ipCfg.requestName } <%-- ${ipCfg.compileId } --%> - 否 - 是 + + @@ -180,48 +207,62 @@ <%-- ${ipCfg.areaEffectiveIds } --%> - 否 - 是 - 已删除 + + + - + + ${ipCfg.creatorName } ${ipCfg.editorName } + + ${ipCfg.auditorName } +
      - - + + + +
      • +
      • +       + + +
      • + <%--
      • --%> +       +       +       + +
      • -
      • -
      • -
      • -
      • -
      • +       +
    From 9e32bbdb23f8fb91eeb3f8cb1407006642d9e409 Mon Sep 17 00:00:00 2001 From: wangxin Date: Tue, 6 Mar 2018 19:00:08 +0800 Subject: [PATCH 16/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9D=A5=E5=87=BD=E8=B0=83=E7=94=A8=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8CIP=E7=B1=BB=E9=85=8D=E7=BD=AE=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComplexStringCfgController.java | 4 +- .../configuration/IpCfgController.java | 7 ++- .../configuration/NumCfgController.java | 2 +- .../configuration/StringCfgController.java | 4 +- .../webapp/WEB-INF/include/form/basicInfo.jsp | 11 ++-- .../webapp/WEB-INF/include/form/ipInfo.jsp | 52 ++++++++++++------- .../WEB-INF/include/form/stringInfo.jsp | 2 +- .../WEB-INF/views/cfg/stringCfgList.jsp | 14 +++++ 8 files changed, 64 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 939f89beb..e5f70d325 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -132,7 +132,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -151,7 +151,7 @@ public class ComplexStringCfgController extends BaseController{ searchBean.setTableName(tableName); ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); 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 b7dbb7414..987907616 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -132,6 +133,7 @@ public class IpCfgController extends BaseController{ return "/cfg/ipCfgForm"; } + @RequiresPermissions("sys:cfg:edit") @RequestMapping(value = {"updateForm"}) public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); @@ -145,7 +147,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -165,7 +167,7 @@ public class IpCfgController extends BaseController{ BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean); model.addAttribute("_cfg", ipCfg); model.addAttribute("tableName", tableName); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -320,6 +322,7 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ + @RequiresPermissions("sys:cfg:edit") @RequestMapping(value = {"deleteCfg"}) public String deleteIpCfg(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model) { model.addAttribute("cfgName", cfgName); diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index 433014a88..86491356b 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -108,7 +108,7 @@ public class NumCfgController extends BaseController{ searchBean.setCfgId(cfgId); NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean); model.addAttribute("_cfg", cfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); 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 34d23207f..ac11ffc3f 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -132,7 +132,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); @@ -151,7 +151,7 @@ public class StringCfgController extends BaseController{ searchBean.setTableName(tableName); BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean); model.addAttribute("_cfg", stringCfg); - List requestInfos=requestInfoService.getAllRequestInfo(); + List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 73b15b9dd..46d5b6533 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -6,7 +6,7 @@
    -
    +
    +
    -
    +
    @@ -79,7 +80,7 @@
    -
    +
    diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index 315838877..1e5aee1c1 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -5,21 +5,23 @@
    -
    - +
    +
    +
    -
    +
    -
    +
    +
    @@ -27,17 +29,19 @@
    -
    +
    +
    -
    +
    +
    @@ -45,17 +49,19 @@
    -
    +
    +
    -
    +
    +
    @@ -63,17 +69,19 @@
    -
    +
    +
    -
    +
    +
    @@ -81,17 +89,19 @@
    -
    +
    +
    -
    +
    +
    @@ -99,19 +109,20 @@
    -
    +
    <%-- --%>
    +
    -
    +
    <%-- --%>
    +
    @@ -126,15 +138,15 @@
    -
    +
    - -
    +
    +
    checked @@ -165,14 +177,16 @@ <%-- --%>
    +
    -
    +
    +
    diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp index 84ff30ca2..b260b5dee 100644 --- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp @@ -61,7 +61,7 @@
    diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp index d17d3fa83..2f81e58be 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp @@ -5,6 +5,20 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1f7b732362ad7071fbd2340bed935ff0166292c0 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 7 Mar 2018 13:36:16 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=E8=A7=A3=E5=86=B3stringCfgForm.jsp?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/cfg/stringCfgForm.jsp | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp index 563688564..98f1634c2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -5,6 +5,20 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + + + + + + + + @@ -133,8 +137,6 @@ } }); - - // 如果在框架或在对话框中，则弹出提示并跳转到首页 if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ alert('未登录或登录超时。请重新登录，谢谢！'); From c48bdc9afe6c4eec782f34f1ee657d44fb68bfd0 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Wed, 7 Mar 2018 16:23:18 +0800 Subject: [PATCH 27/32] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=8B=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/basics/sysDictForm.jsp | 20 ++++++++-------- .../WEB-INF/views/basics/sysDictList.jsp | 24 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 617b1d100..f76a7d3a9 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -141,13 +141,13 @@

    - 配置管理 +

    @@ -155,7 +155,7 @@
    - 配置${not empty sysDictInfo.sysDictId?'修改':'添加'}查看
    + ${not empty sysDictInfo.sysDictId?'修改':'添加'}
    <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp index 15ba81533..72030fa79 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp @@ -5,6 +5,20 @@ <spring:message code="${cfgName}"></spring:message> + + + + + + + + + + + + + + + + + - + @@ -139,8 +139,8 @@ // 如果在框架或在对话框中，则弹出提示并跳转到首页 if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ - alert(""); - top.location = "${pageContext.request.contextPath }"; + alertx(""); + window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000); } diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 98e04853b..c110933af 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -111,7 +111,7 @@ function showTip(mess, type, timeout, lazytime){ // 显示加载框 function loading(mess){ if (mess == undefined || mess == ""){ - mess = "正在提交，请稍等..."; + mess = "OnLoading..."; } resetTip(); top.$.jBox.tip(mess,'loading',{opacity:0}); @@ -119,7 +119,7 @@ function loading(mess){ // 警告对话框 function alertx(mess, closed){ - top.$.jBox.info(mess, '提示', {closed:function(){ + top.$.jBox.info(mess, 'Waring', {closed:function(){ if (typeof closed == 'function') { closed(); } @@ -129,7 +129,7 @@ function alertx(mess, closed){ // 确认对话框 function confirmx(mess, href, closed){ - top.$.jBox.confirm(mess,'系统提示',function(v,h,f){ + top.$.jBox.confirm(mess,'System Prompt',function(v,h,f){ if(v=='ok'){ if (typeof href == 'function') { href(); @@ -152,7 +152,7 @@ function promptx(title, lable, href, closed){ top.$.jBox("
    " + lable + "：
    ", { title: title, submit: function (v, h, f){ if (f.txt == '') { - top.$.jBox.tip("请输入" + lable + "。", 'error'); + top.$.jBox.tip("Please input" + lable + "。", 'error'); return false; } if (typeof href == 'function') { From 7493c116797525dcfce4f1ca5f4907ad327bb615 Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Thu, 8 Mar 2018 11:10:16 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/BaseEntity.java | 18 ++ .../webapp/WEB-INF/views/cfg/requestList.jsp | 221 +++++++++++++----- .../webapp/static/global/css/components.css | 24 +- .../My97DatePicker/skin/WdatePicker.css | 2 +- .../plugins/bootstrap/css/bootstrap.css | 23 +- .../webapp/static/global/scripts/jeesite.js | 44 +++- 6 files changed, 262 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/nis/domain/BaseEntity.java b/src/main/java/com/nis/domain/BaseEntity.java index 4023dc6b7..947d66eb9 100644 --- a/src/main/java/com/nis/domain/BaseEntity.java +++ b/src/main/java/com/nis/domain/BaseEntity.java @@ -57,6 +57,14 @@ public abstract class BaseEntity implements Serializable { * 设置为true后强制执行插入语句，ID不会自动生成，需从手动传入。 */ protected boolean isNewRecord = false; + + + /** + * 筛选搜索框展开状态 + */ + protected boolean isFilterAction = false; + + public BaseEntity() { @@ -162,6 +170,16 @@ public abstract class BaseEntity implements Serializable { public String toString() { return ReflectionToStringBuilder.toString(this); } + + + public void setIsFilterAction(boolean isFilterAction) { + this.isFilterAction = isFilterAction; + } + + @JsonIgnore + public boolean getIsFilterAction() { + return isFilterAction; + } diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 93310dae3..c00dc5467 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -10,67 +10,167 @@

    +

    +
    -
    -
    -
    - -
    -
    +
    +
    - - - -
    - : - - - - + + + - - - - - - - + + - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - -
    -     + +
    + +
    + + 所有状态 + + + +
    + +
    +
    +
    + +
    + + + +
    + +
    + +
    +
    + +
    + +
    + +
    + + + + +
    + + +
    + + + + +
    + + +
    + + + + + + +
    +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
    + +
    + +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
    +
    + +
    +
    + " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
    +
    +
    + +
    +
    + +
    + + +
    + +
    +
    + + + +
    - + + + + + + @@ -87,6 +187,7 @@ + @@ -114,7 +215,7 @@ @@ -145,9 +252,26 @@ - \ No newline at end of file diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 092dca3bf..0438bdf94 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -21531,4 +21531,26 @@ Color library demo vertical-align: middle; } .mt-cookie-consent-bar.mt-cookie-consent-bar-light { background: rgba(238, 238, 238, 0.9); - color: #333; } + color: #333; } + + + + .form-search .pull-left { + float: left !important; + margin-right: 5px; + } + + + .filter-action-select-panle { + border: 1px solid #c2cad8; + background-color: #f6f3f3; + margin-top: 5px; + padding: 10px; + } + + .filter-action-select-panle label{ + line-height: 34px; + } + + + diff --git a/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css b/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css index 08b743975..f9121da77 100644 --- a/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css +++ b/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css @@ -1,2 +1,2 @@ -.Wdate{border:#999 1px solid;height:20px;background:#fff url(datePicker.gif) no-repeat right;} +.Wdate{border:#c2cad8 1px solid;min-height:20px;background:#fff url(datePicker.gif) no-repeat right;} .WdateFmtErr{font-weight:bold;color:red;} \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css index 1d6d56de1..3c2dcb07c 100644 --- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css +++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css @@ -1334,9 +1334,9 @@ a.bg-danger:focus { background-color: #f6b3b8; } .page-header { - padding-bottom: 9px; - margin: 40px 0 20px; - border-bottom: 1px solid #eeeeee; } +/* padding-bottom: 9px; + margin: 40px 0 20px; */ + border-bottom: 1px solid #C2CAD8; } ul, ol { @@ -2037,7 +2037,9 @@ th { .table { width: 100%; max-width: 100%; - margin-bottom: 20px; } + margin-bottom: 20px; + margin-top: 10px; + } .table > thead > tr > th, .table > thead > tr > td, .table > tbody > tr > th, @@ -2058,7 +2060,16 @@ th { .table > thead:first-child > tr:first-child > th, .table > thead:first-child > tr:first-child > td { border-top: 0; - background-color: #F5F6FA; + /* background-color: #F5F6FA; + */ + background-color: #3598dc; + color: #F5F6FA; + height: 38px; + line-height: 38px; + padding-top: 0px; + padding-right: 10px; + padding-bottom: 0px; + padding-left: 10px; } .table > tbody + tbody { border-top: 2px solid #e7ecf1; } @@ -2071,7 +2082,7 @@ th { .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > th, .table-condensed > tfoot > tr > td { - padding: 5px; } + padding-left:10px; } .table-bordered { border: 1px solid #e7ecf1; } diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 98e04853b..dc7ca3281 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -6,15 +6,14 @@ * @version 2014-4-29 */ $(document).ready(function() { + try{ // 链接去掉虚框 $("a").bind("focus",function() { if(this.blur) {this.blur()}; }); //所有下拉框使用select2 - 排除class为noSelect2的
    ${requestInfo.id } ${requestInfo.requestNumber } ${requestInfo.requestOrg }${requestInfo.requestContent } ${requestInfo.taskName } -
    + <%--
    -
    +
    --%>