From fc2af8ba0466026dfeb3d8c8a194f0ff59f1b7cd Mon Sep 17 00:00:00 2001 From: zhangshilin Date: Tue, 6 Mar 2018 10:06:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=9E=8D=E5=90=88=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E8=BE=85=E5=8A=A9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0basics=E7=9B=AE=E5=BD=95=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=95=88bug=EF=BC=8C=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=E4=BC=98=E5=8C=96=E6=97=A0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=96=E7=A0=81=E8=87=AA=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8D=E9=9C=80=E6=89=8B=E5=8A=A8=E8=BE=93?= =?UTF-8?q?=E5=85=A5=EF=BC=88app=E5=BC=BA=E7=89=B9=E5=BE=81=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=E5=9F=9F=E9=80=89=E7=9D=80=E9=85=8D=E7=BD=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BE=85=E6=B7=BB=E5=8A=A0=EF=BC=89=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=E6=97=A0=E4=B8=8A=E7=BA=A7=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=A0=B9=E8=8A=82=E7=82=B9=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceDictInfo.java | 3 +- .../SysDictInfo.java | 2 +- .../java/com/nis/util/ConfigDictUtils.java | 8 +- .../nis/web/controller/BaseController.java | 4 +- .../ServiceDictInfoController.java | 51 +++---- .../SysDictInfoController.java | 53 +++---- .../ComplexStringCfgController.java | 8 +- .../configuration/IpCfgController.java | 15 +- .../configuration/NumCfgController.java | 8 +- .../configuration/StringCfgController.java | 8 +- .../ServiceDictInfoDao.java | 10 +- .../ServiceDictInfoDao.xml | 38 +++-- .../SysDictInfoDao.java | 10 +- .../SysDictInfoDao.xml | 33 +++-- .../ServiceDictInfoService.java | 8 +- .../SysDictInfoService.java | 12 +- .../views/{cfg => basics}/serviceDictForm.jsp | 36 ++--- .../views/{cfg => basics}/serviceDictInfo.jsp | 4 +- .../serviceDictInfoSearchList.jsp | 18 +-- .../views/{cfg => basics}/serviceDictList.jsp | 18 +-- .../views/{cfg => basics}/sysDictForm.jsp | 36 ++--- .../views/{cfg => basics}/sysDictInfo.jsp | 4 +- .../{cfg => basics}/sysDictInfoSearchList.jsp | 18 +-- .../views/{cfg => basics}/sysDictList.jsp | 18 +-- .../WEB-INF/views/cfg/serviceDictMarkList.jsp | 136 ------------------ 25 files changed, 193 insertions(+), 366 deletions(-) rename src/main/java/com/nis/domain/{configuration => basics}/ServiceDictInfo.java (94%) rename src/main/java/com/nis/domain/{configuration => basics}/SysDictInfo.java (95%) rename src/main/java/com/nis/web/controller/{configuration => basics}/ServiceDictInfoController.java (86%) rename src/main/java/com/nis/web/controller/{configuration => basics}/SysDictInfoController.java (86%) rename src/main/java/com/nis/web/dao/{configuration => basics}/ServiceDictInfoDao.java (88%) rename src/main/java/com/nis/web/dao/{configuration => basics}/ServiceDictInfoDao.xml (82%) rename src/main/java/com/nis/web/dao/{configuration => basics}/SysDictInfoDao.java (84%) rename src/main/java/com/nis/web/dao/{configuration => basics}/SysDictInfoDao.xml (79%) rename src/main/java/com/nis/web/service/{configuration => basics}/ServiceDictInfoService.java (93%) rename src/main/java/com/nis/web/service/{configuration => basics}/SysDictInfoService.java (90%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/serviceDictForm.jsp (87%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/serviceDictInfo.jsp (94%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/serviceDictInfoSearchList.jsp (81%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/serviceDictList.jsp (81%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/sysDictForm.jsp (87%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/sysDictInfo.jsp (92%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/sysDictInfoSearchList.jsp (82%) rename src/main/webapp/WEB-INF/views/{cfg => basics}/sysDictList.jsp (82%) delete mode 100644 src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp diff --git a/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java similarity index 94% rename from src/main/java/com/nis/domain/configuration/ServiceDictInfo.java rename to src/main/java/com/nis/domain/basics/ServiceDictInfo.java index 6c2cdcbff..596d15bcd 100644 --- a/src/main/java/com/nis/domain/configuration/ServiceDictInfo.java +++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java @@ -1,4 +1,4 @@ -package com.nis.domain.configuration; +package com.nis.domain.basics; import java.util.ArrayList; import java.util.Date; @@ -131,6 +131,7 @@ public class ServiceDictInfo extends BaseEntity{ public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i>>>>"+serviceDictInfo.getParent().getServiceDictId()); if (serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null && serviceDictInfo.getParent().getServiceDictId().equals(parentId)){ list.add(serviceDictInfo); diff --git a/src/main/java/com/nis/domain/configuration/SysDictInfo.java b/src/main/java/com/nis/domain/basics/SysDictInfo.java similarity index 95% rename from src/main/java/com/nis/domain/configuration/SysDictInfo.java rename to src/main/java/com/nis/domain/basics/SysDictInfo.java index 5653f1e56..c30a440f6 100644 --- a/src/main/java/com/nis/domain/configuration/SysDictInfo.java +++ b/src/main/java/com/nis/domain/basics/SysDictInfo.java @@ -1,4 +1,4 @@ -package com.nis.domain.configuration; +package com.nis.domain.basics; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/java/com/nis/util/ConfigDictUtils.java b/src/main/java/com/nis/util/ConfigDictUtils.java index 7276de78f..455ebe28b 100644 --- a/src/main/java/com/nis/util/ConfigDictUtils.java +++ b/src/main/java/com/nis/util/ConfigDictUtils.java @@ -9,11 +9,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.nis.domain.SysDataDictionaryItem; import com.nis.domain.SysDataDictionaryName; -import com.nis.domain.configuration.ServiceDictInfo; -import com.nis.domain.configuration.SysDictInfo; +import com.nis.domain.basics.ServiceDictInfo; +import com.nis.domain.basics.SysDictInfo; import com.nis.web.dao.SysDictDao; -import com.nis.web.dao.configuration.ServiceDictInfoDao; -import com.nis.web.dao.configuration.SysDictInfoDao; +import com.nis.web.dao.basics.ServiceDictInfoDao; +import com.nis.web.dao.basics.SysDictInfoDao; import com.nis.web.service.SpringContextHolder; 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/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java similarity index 86% rename from src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java rename to src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java index d1de85e4e..3f54a52b5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ServiceDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java @@ -1,4 +1,4 @@ -package com.nis.web.controller.configuration; +package com.nis.web.controller.basics; import java.util.Arrays; import java.util.List; @@ -19,14 +19,13 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.nis.domain.Page; -import com.nis.domain.configuration.ServiceDictInfo; -import com.nis.util.DictUtils; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; @Controller -@RequestMapping(value = "${adminPath}/configuration/serviceDictInfo") +@RequestMapping(value = "${adminPath}/basics/serviceDictInfo") public class ServiceDictInfoController extends BaseController { @@ -78,6 +77,7 @@ public class ServiceDictInfoController extends BaseController { model.addAttribute("selectedType", serviceDictInfo.getItemType()); }else{ model.addAttribute("selectedType", selectedType); + serviceDictInfo.setItemType(selectedType); } //查出顶层分页数据 @@ -87,32 +87,19 @@ public class ServiceDictInfoController extends BaseController { List allList = serviceDictInfoService.findAllDictList(); //处理数据，保留顶层中的所有下层数据 List list = Lists.newArrayList(); - boolean flag = false; for(int i=allList.size()-1;i>=0;i--){ - ServiceDictInfo temp = allList.get(i); - if(temp.getParent()!=null&&temp.getParent().getServiceDictId()!=null&&temp.getParent().getServiceDictId()==0){ - for(ServiceDictInfo topTemp:page.getList()){ - if(temp.getServiceDictId()==topTemp.getServiceDictId()){ - flag = true; - break; - } - } - if(!flag){ - allList.remove(temp); - flag=false; - }else{ - flag=false; - } + ServiceDictInfo se = allList.get(i); + if(se!=null&&se.getParent()!=null&&se.getParent().getServiceDictId()!=null&&se.getParent().getServiceDictId()==0){ + allList.remove(se); } - } - + allList.addAll(page.getList()); ServiceDictInfo.sortList(list,allList,0,true); model.addAttribute("itType", itType); model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("list", list); - return "/cfg/serviceDictList"; + return "/basics/serviceDictList"; } @@ -134,9 +121,9 @@ public class ServiceDictInfoController extends BaseController { Integer selectedType = null; if(serviceDictInfo.getItemType()!=null){ selectedType = serviceDictInfo.getItemType(); - return "redirect:"+ adminPath + "/configuration/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType; + return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType+"&selectedType="+selectedType; } - return "redirect:"+ adminPath + "/configuration/serviceDictInfo/list?itType="+itType; + return "redirect:"+ adminPath + "/basics/serviceDictInfo/list?itType="+itType; } String[] strArr = itType.split("-"); Integer[] intArr = new Integer[strArr.length]; @@ -149,7 +136,7 @@ public class ServiceDictInfoController extends BaseController { model.addAttribute("page", page); - return "/cfg/serviceDictInfoSearchList"; + return "/basics/serviceDictInfoSearchList"; } @@ -162,12 +149,12 @@ public class ServiceDictInfoController extends BaseController { @RequestMapping(value={"form"}) public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) { if(doAction!=null&&doAction.equals("0")){ - return "/cfg/serviceDictInfo"; + return "/basics/serviceDictInfo"; } if (serviceDictInfo.getParent() == null || serviceDictInfo.getParent().getServiceDictId() == null||serviceDictInfo.getParent().getServiceDictId() == 0) { ServiceDictInfo parent = new ServiceDictInfo(); parent.setServiceDictId(0); - parent.setItemValue("无上级"); + parent.setItemValue("根节点"); serviceDictInfo.setParent(parent); } String[] strArr = itType.split("-"); @@ -178,7 +165,7 @@ public class ServiceDictInfoController extends BaseController { model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("serviceDictInfo", serviceDictInfo); model.addAttribute("itType", itType); - return "/cfg/serviceDictForm"; + return "/basics/serviceDictForm"; } /** * 新增或修改 @@ -199,7 +186,7 @@ public class ServiceDictInfoController extends BaseController { addMessage(redirectAttributes, "保存配置失败！"); } - return "redirect:" + adminPath + "/configuration/serviceDictInfo/list?itType="+itType; + return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType; } @@ -220,7 +207,7 @@ public class ServiceDictInfoController extends BaseController { e.printStackTrace(); addMessage(redirectAttributes, "删除配置失败！"); } - return "redirect:" + adminPath + "/configuration/serviceDictInfo/list?itType="+itType; + return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType; } @@ -237,9 +224,9 @@ public class ServiceDictInfoController extends BaseController { public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { List> mapList = Lists.newArrayList(); Map map2 = Maps.newHashMap(); - map2.put("id", -1); + map2.put("id", 0); map2.put("pId", 0); - map2.put("name","无上级"); + map2.put("name","根节点"); //map2.put("placeholder","0"); mapList.add(map2); //找出该类型所有的非叶子配置 diff --git a/src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java similarity index 86% rename from src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java rename to src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index cbd3ab6c5..ef5541ecb 100644 --- a/src/main/java/com/nis/web/controller/configuration/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -1,4 +1,4 @@ -package com.nis.web.controller.configuration; +package com.nis.web.controller.basics; import java.util.Arrays; import java.util.List; @@ -19,14 +19,13 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.nis.domain.Page; -import com.nis.domain.configuration.ServiceDictInfo; -import com.nis.domain.configuration.SysDictInfo; +import com.nis.domain.basics.SysDictInfo; import com.nis.util.StringUtil; import com.nis.util.StringUtils; import com.nis.web.controller.BaseController; @Controller -@RequestMapping(value = "${adminPath}/configuration/sysDictInfo") +@RequestMapping(value = "${adminPath}/basics/sysDictInfo") public class SysDictInfoController extends BaseController { @@ -78,6 +77,7 @@ public class SysDictInfoController extends BaseController { model.addAttribute("selectedType", sysDictInfo.getItemType()); }else{ model.addAttribute("selectedType", selectedType); + sysDictInfo.setItemType(selectedType); } //查出顶层分页数据 @@ -87,32 +87,19 @@ public class SysDictInfoController extends BaseController { List allList = sysDictInfoService.findAllDictList(); //处理数据，保留顶层中的所有下层数据 List list = Lists.newArrayList(); - boolean flag = false; for(int i=allList.size()-1;i>=0;i--){ - SysDictInfo temp = allList.get(i); - if(temp.getParent()!=null&&temp.getParent().getSysDictId()!=null&&temp.getParent().getSysDictId()==0){ - for(SysDictInfo topTemp:page.getList()){ - if(temp.getSysDictId()==topTemp.getSysDictId()){ - flag = true; - break; - } - } - if(!flag){ - allList.remove(temp); - flag=false; - }else{ - flag=false; - } - } - + SysDictInfo se = allList.get(i); + if(se!=null&&se.getParent()!=null&&se.getParent().getSysDictId()!=null&&se.getParent().getSysDictId()==0){ + allList.remove(se); + } } - + allList.addAll(page.getList()); SysDictInfo.sortList(list,allList,0,true); model.addAttribute("itType", itType); model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("list", list); - return "/cfg/sysDictList"; + return "/basics/sysDictList"; } /** @@ -133,9 +120,9 @@ public class SysDictInfoController extends BaseController { Integer selectedType = null; if(sysDictInfo.getItemType()!=null){ selectedType = sysDictInfo.getItemType(); - return "redirect:"+ adminPath + "/configuration/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType; + return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType+"&selectedType="+selectedType; } - return "redirect:"+ adminPath + "/configuration/sysDictInfo/list?itType="+itType; + return "redirect:"+ adminPath + "/basics/sysDictInfo/list?itType="+itType; } String[] strArr = itType.split("-"); Integer[] intArr = new Integer[strArr.length]; @@ -148,7 +135,7 @@ public class SysDictInfoController extends BaseController { model.addAttribute("page", page); - return "/cfg/sysDictInfoSearchList"; + return "/basics/sysDictInfoSearchList"; } @@ -169,12 +156,12 @@ public class SysDictInfoController extends BaseController { @RequestMapping(value={"form"}) public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType) { if(doAction!=null&&doAction.equals("0")){ - return "/cfg/sysDictInfo"; + return "/basics/sysDictInfo"; } if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null||sysDictInfo.getParent().getSysDictId() == 0) { SysDictInfo parent = new SysDictInfo(); parent.setSysDictId(0); - parent.setItemValue("无上级"); + parent.setItemValue("根节点"); sysDictInfo.setParent(parent); } String[] strArr = itType.split("-"); @@ -185,7 +172,7 @@ public class SysDictInfoController extends BaseController { model.addAttribute("intArr", Arrays.asList(intArr)); model.addAttribute("sysDictInfo", sysDictInfo); model.addAttribute("itType", itType); - return "/cfg/sysDictForm"; + return "/basics/sysDictForm"; } /** * 新增或修改 @@ -206,7 +193,7 @@ public class SysDictInfoController extends BaseController { addMessage(redirectAttributes, "保存配置失败！"); } - return "redirect:" + adminPath + "/configuration/sysDictInfo/list?itType="+itType; + return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType; } /** @@ -224,7 +211,7 @@ public class SysDictInfoController extends BaseController { e.printStackTrace(); addMessage(redirectAttributes, "删除配置失败！"); } - return "redirect:" + adminPath + "/configuration/sysDictInfo/list?itType="+itType; + return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType; } @@ -241,9 +228,9 @@ public class SysDictInfoController extends BaseController { public List> treeData(@RequestParam(required=false) String extId,@RequestParam(required=false) String isShowHide, HttpServletResponse response, String itType) { List> mapList = Lists.newArrayList(); Map map2 = Maps.newHashMap(); - map2.put("id", -1); + map2.put("id", 0); map2.put("pId", 0); - map2.put("name","无上级"); + map2.put("name","根节点"); //map2.put("placeholder","0"); mapList.add(map2); //找出该类型所有的非叶子配置 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 57133d029..e39307844 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; 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.util.Constants; import com.nis.web.controller.BaseController; @@ -57,11 +57,11 @@ public class ComplexStringCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ 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 f3c399778..c073c1700 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -14,10 +14,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; -import com.nis.domain.configuration.BaseCfg; +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; @@ -68,11 +67,11 @@ public class IpCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ @@ -109,6 +108,7 @@ public class IpCfgController extends BaseController{ ipcfg.setAction(action); ipcfg.setServiceId(serviceId); model.addAttribute("_cfg", ipcfg); + long compileId=this.getCompileId(); model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); @@ -201,7 +201,7 @@ public class IpCfgController extends BaseController{ addMessage(model,"保存失败！"); }else if(!StringUtils.isBlank(ipCfg.getTableName())){ int serviceId=ipCfg.getServiceId(); - long compileId=getCompileId(ipCfg); + long compileId=getCompileId(); ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); @@ -225,7 +225,7 @@ public class IpCfgController extends BaseController{ if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); if(!StringUtils.isBlank(tableName)){ - long compileId=getCompileId(ipCfg); + long compileId=getCompileId(); ipCfg.setTableName(tableName); ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); ipCfg.setCreateTime(new Date()); @@ -235,7 +235,6 @@ public class IpCfgController extends BaseController{ if(ipCfg.getCfgId()==null){ ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); ipCfg.setCreateTime(new Date()); - ipCfgService.addIpCfg(ipCfg); }else{ ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); ipCfg.setEditTime(new Date()); 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 a8bba132b..85e0982e8 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; 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.util.Constants; import com.nis.web.controller.BaseController; @@ -52,11 +52,11 @@ public class NumCfgController extends BaseController{ model.addAttribute("action", cfg.getAction()); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); }else{ logger.error("未获取到正确的serviceId"); 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 33ad236ec..d6c119476 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; +import com.nis.domain.basics.ServiceDictInfo; 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.util.Constants; import com.nis.web.controller.BaseController; @@ -57,11 +57,11 @@ public class StringCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java similarity index 88% rename from src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java rename to src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java index 12271901f..828aff23a 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java @@ -1,11 +1,11 @@ -package com.nis.web.dao.configuration; +package com.nis.web.dao.basics; import java.util.List; import org.apache.ibatis.annotations.Param; import com.nis.domain.SysMenu; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @@ -70,12 +70,18 @@ public interface ServiceDictInfoDao extends CrudDao { * @return */ List findByItemCode(Integer itemCode); + /** + * 查询itemCode最大值 + * @return + */ + Integer findMaxItemCode(); List findItemDict(@Param("itemType")int itemType,@Param("isValid")int isValid); List findAllItemDict(@Param("itemType")int itemType); + diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml similarity index 82% rename from src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml rename to src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml index 23c70259a..fa5903350 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml @@ -1,8 +1,8 @@ - + - + @@ -13,23 +13,18 @@ - - - - - - - + + - + - + @@ -53,7 +48,7 @@ - SELECT * FROM service_dict_info WHERE is_valid=1 AND parent_id = 0 @@ -84,7 +79,7 @@ - SELECT * FROM service_dict_info WHERE is_valid=1 AND parent_id = 0 @@ -128,7 +123,7 @@ - SELECT FROM service_dict_info s @@ -137,7 +132,7 @@ - SELECT * FROM service_dict_info WHERE is_valid=1 @@ -169,7 +164,7 @@ - SELECT * FROM service_dict_info WHERE is_valid=1 @@ -203,7 +198,7 @@ - select from service_dict_info s where s.service_dict_id = #{serviceDictId} @@ -219,17 +214,20 @@ - select from service_dict_info s where s.item_code = #{itemCode} - + + - + insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time) values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, diff --git a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java similarity index 84% rename from src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java rename to src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java index 7dbe4cb04..af3dcaca9 100644 --- a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.java @@ -1,8 +1,8 @@ -package com.nis.web.dao.configuration; +package com.nis.web.dao.basics; import java.util.List; -import com.nis.domain.configuration.SysDictInfo; +import com.nis.domain.basics.SysDictInfo; import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; @@ -69,6 +69,12 @@ public interface SysDictInfoDao extends CrudDao { */ List getDictByParentId(Integer parentId); + /** + * 查询最大itemCode值 + * @return + */ + Integer findMaxItemCode(); + diff --git a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml similarity index 79% rename from src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml rename to src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml index 63968cd75..06473de7a 100644 --- a/src/main/java/com/nis/web/dao/configuration/SysDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml @@ -1,8 +1,8 @@ - + - + @@ -13,23 +13,18 @@ - - - - - - - + + - + - + @@ -54,7 +49,7 @@ - SELECT * FROM sys_dict_info WHERE is_valid=1 AND parent_id = 0 @@ -94,7 +89,7 @@ - SELECT * FROM sys_dict_info WHERE is_valid=1 @@ -127,7 +122,7 @@ - select from sys_dict_info s where s.sys_dict_id = #{sysDictId} @@ -135,7 +130,7 @@ - + insert into sys_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time) values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, @@ -147,7 +142,7 @@ - SELECT FROM sys_dict_info s @@ -179,7 +174,7 @@ - select from sys_dict_info s where s.item_code = #{itemCode} @@ -192,5 +187,9 @@ from sys_dict_info s where parent_id = #{parentId} + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java similarity index 93% rename from src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java rename to src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java index e2d6bd865..6dd6c470a 100644 --- a/src/main/java/com/nis/web/service/configuration/ServiceDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java @@ -1,4 +1,4 @@ -package com.nis.web.service.configuration; +package com.nis.web.service.basics; import java.util.Date; import java.util.List; @@ -10,10 +10,10 @@ import com.google.common.collect.Lists; import com.nis.domain.Page; import com.nis.domain.SysMenu; import com.nis.domain.SysUser; -import com.nis.domain.configuration.ServiceDictInfo; +import com.nis.domain.basics.ServiceDictInfo; import com.nis.util.Constants; import com.nis.util.StringUtil; -import com.nis.web.dao.configuration.ServiceDictInfoDao; +import com.nis.web.dao.basics.ServiceDictInfoDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; @@ -172,6 +172,8 @@ public class ServiceDictInfoService extends BaseService{ } SysUser user = UserUtils.getUser(); if(StringUtil.isEmpty(serviceDictInfo.getServiceDictId())) {//新增 + Integer maxCode = serviceDictInfoDao.findMaxItemCode(); + serviceDictInfo.setItemCode(maxCode==null?1:(maxCode+1)); serviceDictInfo.setIsValid(1); serviceDictInfo.setServiceDictCreator(user); serviceDictInfo.setCreateTime(new Date()); diff --git a/src/main/java/com/nis/web/service/configuration/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java similarity index 90% rename from src/main/java/com/nis/web/service/configuration/SysDictInfoService.java rename to src/main/java/com/nis/web/service/basics/SysDictInfoService.java index 6b1b93d8e..8dbfcf48b 100644 --- a/src/main/java/com/nis/web/service/configuration/SysDictInfoService.java +++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java @@ -1,4 +1,4 @@ -package com.nis.web.service.configuration; +package com.nis.web.service.basics; import java.util.Date; import java.util.List; @@ -9,11 +9,9 @@ import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.nis.domain.Page; import com.nis.domain.SysUser; -import com.nis.domain.configuration.ServiceDictInfo; -import com.nis.domain.configuration.SysDictInfo; -import com.nis.domain.configuration.SysDictInfo; +import com.nis.domain.basics.SysDictInfo; import com.nis.util.StringUtil; -import com.nis.web.dao.configuration.SysDictInfoDao; +import com.nis.web.dao.basics.SysDictInfoDao; import com.nis.web.security.UserUtils; import com.nis.web.service.BaseService; @@ -105,6 +103,10 @@ public class SysDictInfoService extends BaseService{ } SysUser user = UserUtils.getUser(); if(StringUtil.isEmpty(sysDictInfo.getSysDictId())) {//新增 + if(sysDictInfo.getItemCode()==null){ + Integer maxCode = sysDictInfoDao.findMaxItemCode(); + sysDictInfo.setItemCode(maxCode==null?1:(maxCode+1)); + } sysDictInfo.setIsValid(1); sysDictInfo.setSysDictCreator(user); sysDictInfo.setCreateTime(new Date()); diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp similarity index 87% rename from src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp rename to src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp index 272ac27a7..4fbbb35d4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp @@ -13,7 +13,7 @@ type:'post', async:true, cache:false, - url:'${ctx}/configuration/serviceDictInfo/ajaxItemType', + url:'${ctx}/basics/serviceDictInfo/ajaxItemType', data:{parent:parent}, success:function(data){ $("#itemType option").each(function(){ @@ -32,7 +32,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/serviceDictInfo/ajaxType', + url:'${ctx}/basics/serviceDictInfo/ajaxType', data:{parent:$("#serviceDictInfoId").val(),child:$("#itemType option:selected").val()}, success:function(data){ flag=data; @@ -46,7 +46,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/serviceDictInfo/ajaxChildrenType', + url:'${ctx}/basics/serviceDictInfo/ajaxChildrenType', data:{parent:"${serviceDictInfo.serviceDictId}",newItemType:$("#itemType option:selected").val()}, success:function(data){ flag=data; @@ -60,7 +60,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/serviceDictInfo/ajaxLeafChange', + url:'${ctx}/basics/serviceDictInfo/ajaxLeafChange', data:{parent:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val()}, success:function(data){ flag=data; @@ -75,14 +75,14 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/serviceDictInfo/ajaxLeafHasTree', + url:'${ctx}/basics/serviceDictInfo/ajaxLeafHasTree', data:{serviceDictId:"${serviceDictInfo.serviceDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#serviceDictInfoId").val()}, success:function(data){ flag=data; } }); return flag; - },"该配置无上级，不得设为叶子节点"); + },"该配置上级为根节点，不得设为叶子节点"); @@ -90,12 +90,6 @@ $("#inputForm").validate({ //需验证 item_code item_value rules: { - 'itemCode':{ - required:true, - digits:true, - codeNumber:true, - remote:"${ctx}/configuration/serviceDictInfo/isItemCodeRepeat?oldItemCode=${serviceDictInfo.itemCode}" - }, 'itemValue':{ required:true }, @@ -110,12 +104,6 @@ }, messages: { - 'itemCode':{ - required:'编码必须填写', - digits:'请填写整数值', - codeNumber:'请填写合适的数值（0~200000000）', - remote:"该配置编码已存在" - }, 'itemValue':{ required:'编码对应值必须填写' }, @@ -125,7 +113,7 @@ }, 'isLeaf':{ leafChange:'该配置包含下级配置，不得改为叶子节点', - leafHasTree:'该配置无上级，不得设为叶子节点' + leafHasTree:'该配置上级为根节点，不得设为叶子节点' } }, @@ -182,14 +170,14 @@
- +
- +
@@ -208,12 +196,12 @@
-
+ <%--
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp similarity index 94% rename from src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp rename to src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp index dc30f5432..9919e210a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfo.jsp @@ -35,13 +35,13 @@
- +
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp similarity index 81% rename from src/main/webapp/WEB-INF/views/cfg/serviceDictInfoSearchList.jsp rename to src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp index 8c2d5f369..b9c9c7b92 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp @@ -16,7 +16,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -24,7 +24,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -37,9 +37,9 @@

@@ -58,7 +58,7 @@
- +
@@ -91,7 +91,7 @@ 配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作 - ${serviceDictInfo.itemValue} + ${serviceDictInfo.itemValue} ${serviceDictInfo.itemCode} ${fns:abbr(serviceDictInfo.itemDesc,15)} ${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")} @@ -108,12 +108,12 @@
操作 diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp similarity index 81% rename from src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp rename to src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 974909b41..a0ac51e3f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -16,7 +16,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/list?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/list?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -24,7 +24,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/serviceDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/serviceDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -37,9 +37,9 @@

@@ -58,7 +58,7 @@
- +
@@ -91,7 +91,7 @@ 配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作 - ${serviceDictInfo.itemValue} + ${serviceDictInfo.itemValue} ${serviceDictInfo.itemCode} ${fns:abbr(serviceDictInfo.itemDesc,15)} ${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")} @@ -108,12 +108,12 @@
操作 diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp similarity index 87% rename from src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp rename to src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index 18f257834..617b1d100 100644 --- a/src/main/webapp/WEB-INF/views/cfg/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -13,7 +13,7 @@ type:'post', async:true, cache:false, - url:'${ctx}/configuration/sysDictInfo/ajaxItemType', + url:'${ctx}/basics/sysDictInfo/ajaxItemType', data:{parent:parent}, success:function(data){ $("#itemType option").each(function(){ @@ -32,7 +32,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/sysDictInfo/ajaxType', + url:'${ctx}/basics/sysDictInfo/ajaxType', data:{parent:$("#sysDictInfoId").val(),child:$("#itemType option:selected").val()}, success:function(data){ flag=data; @@ -46,7 +46,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/sysDictInfo/ajaxChildrenType', + url:'${ctx}/basics/sysDictInfo/ajaxChildrenType', data:{parent:"${sysDictInfo.sysDictId}",newItemType:$("#itemType option:selected").val()}, success:function(data){ flag=data; @@ -60,7 +60,7 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/sysDictInfo/ajaxLeafChange', + url:'${ctx}/basics/sysDictInfo/ajaxLeafChange', data:{parent:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val()}, success:function(data){ flag=data; @@ -75,14 +75,14 @@ $.ajax({ type:'post', async:false, - url:'${ctx}/configuration/sysDictInfo/ajaxLeafHasTree', + url:'${ctx}/basics/sysDictInfo/ajaxLeafHasTree', data:{sysDictId:"${sysDictInfo.sysDictId}",newIsLeaf:$("#isLeaf option:selected").val(),parentId:$("#sysDictInfoId").val()}, success:function(data){ flag=data; } }); return flag; - },"该配置无上级，不得设为叶子节点"); + },"该配置上级为根节点，不得设为叶子节点"); @@ -90,12 +90,6 @@ $("#inputForm").validate({ //需验证 item_code item_value rules: { - 'itemCode':{ - required:true, - digits:true, - codeNumber:true, - remote:"${ctx}/configuration/sysDictInfo/isItemCodeRepeat?oldItemCode=${sysDictInfo.itemCode}" - }, 'itemValue':{ required:true }, @@ -110,12 +104,6 @@ }, messages: { - 'itemCode':{ - required:'编码必须填写', - digits:'请填写整数值', - codeNumber:'请填写合适的数值（0~200000000）', - remote:"该配置编码已存在" - }, 'itemValue':{ required:'编码对应值必须填写' }, @@ -125,7 +113,7 @@ }, 'isLeaf':{ leafChange:'该配置包含下级配置，不得改为叶子节点', - leafHasTree:'该配置无上级，不得设为叶子节点' + leafHasTree:'该配置上级为根节点，不得设为叶子节点' } }, @@ -182,14 +170,14 @@
- +
- +
@@ -208,12 +196,12 @@
-
+ <%--
-
+
--%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp similarity index 92% rename from src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp rename to src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp index 2c1149914..a2a60a82d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/sysDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp @@ -35,13 +35,13 @@
- +
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp similarity index 82% rename from src/main/webapp/WEB-INF/views/cfg/sysDictInfoSearchList.jsp rename to src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp index b114ad7e0..9c14e8ae5 100644 --- a/src/main/webapp/WEB-INF/views/cfg/sysDictInfoSearchList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp @@ -16,7 +16,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -24,7 +24,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -37,9 +37,9 @@

@@ -58,7 +58,7 @@
- +
@@ -91,7 +91,7 @@ 配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作 - ${sysDictInfo.itemValue} + ${sysDictInfo.itemValue} ${sysDictInfo.itemCode} ${fns:abbr(sysDictInfo.itemDesc,15)} ${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} @@ -108,12 +108,12 @@
操作 diff --git a/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp similarity index 82% rename from src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp rename to src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 3798fe30a..391b81d92 100644 --- a/src/main/webapp/WEB-INF/views/cfg/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -16,7 +16,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/list?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/list?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -24,7 +24,7 @@ $("#intype").attr("name",$("#seltype").val()); $("#pageNo").val(n); $("#pageSize").val(s); - $("#searchForm").attr("action","${ctx}/configuration/sysDictInfo/searchList?itType=${itType}"); + $("#searchForm").attr("action","${ctx}/basics/sysDictInfo/searchList?itType=${itType}"); $("#searchForm").submit(); return false; } @@ -37,9 +37,9 @@

@@ -58,7 +58,7 @@
- +
@@ -91,7 +91,7 @@ 配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作 - ${sysDictInfo.itemValue} + ${sysDictInfo.itemValue} ${sysDictInfo.itemCode} ${fns:abbr(sysDictInfo.itemDesc,15)} ${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")} @@ -108,12 +108,12 @@
操作 diff --git a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp b/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp deleted file mode 100644 index eb1ac56e4..000000000 --- a/src/main/webapp/WEB-INF/views/cfg/serviceDictMarkList.jsp +++ /dev/null @@ -1,136 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -标签配置信息 - - - - - - - - - - -

- 标签配置管理 -

- -
-
-
-
-
- 标签配置列表 -
-
-
-
-
- - - - -
- - - - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - - -
- - - - - - - - - - - - - - - - - -
配置内容配置编码描述信息数据类型叶子节点创建人员创建时间最近修改人员最近修改时间操作
${serviceDictInfo.itemValue}${serviceDictInfo.itemCode}${fns:abbr(serviceDictInfo.itemDesc,15)}${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}${fns:getDictLabel("SYS_YES_NO",serviceDictInfo.isLeaf,"0")} - ${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name} - - ${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name} - -
- 操作 - -
-
- - -
-
-
- -
-
-
-
${page}
- - \ No newline at end of file