From f02d7aca2027a4dbd6d591b13b785a2393cbe18d Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Mon, 12 Mar 2018 14:47:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=20=E2=91=A0=E8=A7=A3=E5=86=B3=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=9B=9E=E4=BC=A0bug,=20=20=20=20=20?= =?UTF-8?q?=E2=91=A1=E5=88=97=E8=A1=A8=E5=BA=8F=E5=8F=B7=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8D=E5=8F=82=E4=B8=8E=E4=B8=BB=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E8=AE=A1=E7=AE=97=EF=BC=8C=E4=B8=8B=E7=BA=A7=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E4=BB=A5=E6=A0=87=E8=AF=86=E7=AC=A6=E9=9A=94=E5=BC=80?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E8=AF=86=E7=AC=A6=E5=9C=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20=20=20=20=20=E2=91=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=80=BB=E6=9D=A1=E6=95=B0=E6=8C=89=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E6=95=B0=E7=9B=AE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=20=20=20=20=20=E2=91=A3=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=20=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9A=20=20=20=20=20=E2=91=A0=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=A1=B5=E9=9D=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=E6=97=B6=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/Page.java | 2 +- .../nis/domain/basics/ServiceDictInfo.java | 40 +++++++++++++++++++ .../com/nis/domain/basics/SysDictInfo.java | 39 +++++++++++++++++- .../basics/ServiceDictInfoController.java | 19 ++++++++- .../basics/SysDictInfoController.java | 19 ++++++++- .../basics/ServiceDictInfoService.java | 1 + .../resources/messages/message_en.properties | 5 +++ .../messages/message_zh_CN.properties | 5 +++ src/main/resources/nis.properties | 8 ++-- .../basics/serviceDictInfoSearchList.jsp | 12 +++--- .../WEB-INF/views/basics/serviceDictList.jsp | 10 ++--- .../views/basics/sysDictInfoSearchList.jsp | 10 ++--- .../WEB-INF/views/basics/sysDictList.jsp | 10 ++--- 13 files changed, 151 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java index e3055a5a5..12c4ce974 100644 --- a/src/main/java/com/nis/domain/Page.java +++ b/src/main/java/com/nis/domain/Page.java @@ -379,7 +379,7 @@ public class Page { sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / "); sb.append(" 页，"); - sb.append("共 " + count + " 条"+(message!=null?message:"")+"\n"); + sb.append("共 " + count + " 条"+(message!=null?message:"")+"\n"); sb.insert(0,"\n"); diff --git a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java index ea283d5e3..738bc8f5d 100644 --- a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java +++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.nis.domain.BaseEntity; import com.nis.domain.SysMenu; import com.nis.domain.SysUser; +import com.nis.util.Configurations; /** * 业务辅助表-业务字典信息表 * @author zsl @@ -39,6 +40,8 @@ public class ServiceDictInfo extends BaseEntity{ private Date editBeginDate; // 修改开始日期 private Date editEndDate; // 修改结束日期 + private String showSequence; //显示序号 + public Integer getServiceDictId() { return serviceDictId; @@ -150,6 +153,12 @@ public class ServiceDictInfo extends BaseEntity{ public void setEditEndDate(Date editEndDate) { this.editEndDate = editEndDate; } + public String getShowSequence() { + return showSequence; + } + public void setShowSequence(String showSequence) { + this.showSequence = showSequence; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i{ return listTemp.size(); } + //处理下级序号 + public static void addChildrenSeq(List list,Integer parentId){ + int countNo = 1; + for(int i=0; i{ private Date editBeginDate; // 修改开始日期 private Date editEndDate; // 修改结束日期 + private String showSequence; //显示序号 public Integer getSysDictId() { @@ -147,7 +149,12 @@ public class SysDictInfo extends BaseEntity{ public void setEditEndDate(Date editEndDate) { this.editEndDate = editEndDate; } - + public void setShowSequence(String showSequence) { + this.showSequence = showSequence; + } + public String getShowSequence() { + return showSequence; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i{ } } } - + + //处理下级序号 + public static void addChildrenSeq(List list,Integer parentId){ + int countNo = 1; + for(int i=0; i showTotalCount = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr); + model.addAttribute("showTotalCount", showTotalCount.size()); //查出顶层分页数据 Page page = serviceDictInfoService.findTopDictList(new Page(request, response), serviceDictInfo,intArr); + //植入序号 + for(int i=0;i allList = serviceDictInfoService.findAllDictList(); @@ -99,7 +107,8 @@ public class ServiceDictInfoController extends BaseController { allList.addAll(page.getList()); ServiceDictInfo.sortList(list,allList,0,true); - + //处理下级序号 + ServiceDictInfo.addChildrenSeq(list, 0); model.addAttribute("itType", itType); model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("list", list); @@ -156,9 +165,13 @@ public class ServiceDictInfoController extends BaseController { //先查出条件查询所有数据（注意顺序） List allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr); - + model.addAttribute("showTotalCount", allList.size()); //查出条件查询顶层分页数据 Page page = serviceDictInfoService.findDictTopSearchList(new Page(request, response), serviceDictInfo,intArr); + //植入序号 + for(int i=0;i showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr); + model.addAttribute("showTotalCount", showTotalCount.size()); //查出顶层分页数据 Page page = sysDictInfoService.findTopDictList(new Page(request, response), sysDictInfo,intArr); + //植入序号 + for(int i=0;i allList = sysDictInfoService.findAllDictList(); @@ -98,6 +106,8 @@ public class SysDictInfoController extends BaseController { allList.addAll(page.getList()); SysDictInfo.sortList(list,allList,0,true); + //处理下级序号 + SysDictInfo.addChildrenSeq(list, 0); model.addAttribute("itType", itType); model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("list", list); @@ -152,9 +162,13 @@ public class SysDictInfoController extends BaseController { model.addAttribute("searchContent", searchContent); //先查出条件查询所有数据（注意顺序） List allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr); - + model.addAttribute("showTotalCount", allList.size()); //查出条件查询顶层分页数据 Page page = sysDictInfoService.findDictTopSearchList(new Page(request, response), sysDictInfo,intArr); + //植入序号 + for(int i=0;i=0;i--){ SysDictInfo se = list.get(i); System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId()); diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java index 93813be7f..33d873c28 100644 --- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -471,5 +471,6 @@ public class ServiceDictInfoService extends BaseService{ + } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f2ac9a917..eea83a3c6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -46,6 +46,11 @@ dns_monitor=dns monitor basic_configuration=basic configuration letter_from=letter from classification=classification +classification_manage=classification_manage +attribute_manage=attribute_manage +area_manage=area_manage +isp_manage=isp_manage +feature_scope_manage=feature_scope_manage special_tasks=special tasks label_manage=label manage protect_list=protect list diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index ad3d3e7b3..ae12e8bc9 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -44,6 +44,11 @@ dns_monitor=DNS\u7ba1\u63a7 basic_configuration=\u57fa\u672c\u914d\u7f6e letter_from=\u6765\u51fd\u5355\u4f4d classification=\u5206\u7c7b\u6027\u8d28 +classification_manage=\u5206\u7c7b\u7ba1\u7406 +attribute_manage=\u6027\u8d28\u7ba1\u7406 +area_manage=\u5730\u57df\u7ba1\u7406 +isp_manage=\u8fd0\u8425\u5546\u7ba1\u7406 +feature_scope_manage=\u7279\u5f81\u4f5c\u7528\u57df\u7ba1\u7406 special_tasks=\u4e13\u9879\u4efb\u52a1 label_manage=\u6807\u7b7e\u7ba1\u7406 protect_list=\u4fdd\u62a4\u540d\u5355 diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index eb0868d27..515abe4de 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -5,7 +5,7 @@ adminPath=/nis servicePath=/service #\u5206\u9875\u914d\u7f6e -page.pageSize=5 +page.pageSize=20 #\u5206\u9875\u914d\u7f6e page.count=0 @@ -235,5 +235,7 @@ jdbc.hive.AName=xa_dfbhit_hive jdbc.hive.BName=xa_z2_mesalog_hive maxPageSize=100000 - -maxLevelNo=4 \ No newline at end of file +#允许配置最大层级 +maxLevelNo=4 +#上下级显示间隔标识符 +childrenMark=. \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp index 75d509ca5..bd60d355a 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp @@ -4,7 +4,7 @@ 配置信息 - +<%-- --%>