diff --git a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java index 7f98c861e..019d7ac11 100644 --- a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java +++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java @@ -43,6 +43,13 @@ public class ServiceDictInfo extends BaseEntity{ private String showSequence; //显示序号 + /** + * 封装参数数据类型, + * + */ + private List conditionType; + + public Integer getServiceDictId() { return serviceDictId; } @@ -159,6 +166,12 @@ public class ServiceDictInfo extends BaseEntity{ public void setShowSequence(String showSequence) { this.showSequence = showSequence; } + public List getConditionType() { + return conditionType; + } + public void setConditionType(List conditionType) { + this.conditionType = conditionType; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i{ private String showSequence; //显示序号 + /** + * 封装参数数据类型, + * + */ + private List conditionType; + public Integer getSysDictId() { return sysDictId; @@ -155,6 +161,12 @@ public class SysDictInfo extends BaseEntity{ public String getShowSequence() { return showSequence; } + public List getConditionType() { + return conditionType; + } + public void setConditionType(List conditionType) { + this.conditionType = conditionType; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i getItemTypeByNo(String dictKey, List intArr){ + List itemValueList = Lists.newArrayList(); + if(intArr==null||intArr.size()==0){ + List itemList = DictUtils.getDictList(dictKey); + if(!StringUtil.isEmpty(itemList)){ + for(SysDataDictionaryItem sd:itemList){ + itemValueList.add(sd.getItemValue()); + } + } + }else{ + for(Object itemCode:intArr){ + itemValueList.add(DictUtils.getDictLabel(dictKey,itemCode.toString())); + } } - if(value.trim().equals("attribute")){ - result = "attribute_manage"; - } - if(value.trim().equals("label")){ - result = "label_manage"; - } - if(value.trim().equals("area")){ - result = "area_manage"; - } - if(value.trim().equals("isp")){ - result = "isp_manage"; - } - if(value.trim().equals("scope")){ - result = "feature_scope_manage"; - } - return result; + + return itemValueList; } /** * 根据数据类型编码取出权限标识码 - * @param dictKey + * @param dictKey 数据的字典标识 * @param intArr * @return */ public static String getPermissionByNo(String dictKey, List intArr){ - String result = ""; - String value = DictUtils.getDictLabel(dictKey,intArr.get(0).toString()); - if(value.trim().equals("classification")){ - result = "classification"; + List itemValueList = Lists.newArrayList(); + StringBuffer sb = new StringBuffer(""); + itemValueList=getItemTypeByNo(dictKey,intArr); + if(!StringUtil.isEmpty(itemValueList)){ + for(String itermvalue:itemValueList){ + sb.append(itermvalue); + } } - if(value.trim().equals("attribute")){ - result = "attribute"; - } - if(value.trim().equals("label")){ - result = "label"; - } - if(value.trim().equals("area")){ - result = "area"; - } - if(value.trim().equals("isp")){ - result = "isp"; - } - if(value.trim().equals("scope")){ - result = "scope"; - } - return result; + return sb.toString(); + } + + /** + * 根据数据类型标识取出数据类型的itemCode + * @param dictKey 数据的字典标识 + * @param intArr + * @return + */ + public static List getAllType(String dictKey){ + List itemCodeList = Lists.newArrayList(); + List itemList = DictUtils.getDictList(dictKey); + if(!StringUtil.isEmpty(itemList)){ + for(SysDataDictionaryItem sd:itemList){ + itemCodeList.add(Integer.valueOf(sd.getItemCode())); + } + } + return itemCodeList; } + /** + * 根据传入数据拆分数据类型参数 + * @param dictKey 数据的字典标识 + * @param itType 传入参数 + * @return + */ + public static List dealTypeCondition(String dictKey,String itType ){ + List intArr = Lists.newArrayList(); + if(StringUtil.isEmpty(itType)){ + intArr = ConfigDictUtils.getAllType(dictKey); + }else{ + String[] strArr = itType.split("-"); + Integer[] tempArr = new Integer[strArr.length]; + for(int i=0;i intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SERVICE_DICT_ITM_TYPE", ""), itType); String searchType = null; String searchContent = null; if(!StringUtils.isBlank(serviceDictInfo.getItemCode())){ @@ -93,12 +74,15 @@ public class ServiceDictInfoController extends BaseController { model.addAttribute("searchContent", searchContent); Page pageCondition = new Page(request, response); + //查询符合条件总数 List allList = serviceDictInfoService.findAllServiceDictInfo(serviceDictInfo,intArr,pageCondition.getOrderBy()); model.addAttribute("showTotalCount", allList.size()); //查出顶层分页数据 - Page page = serviceDictInfoService.findTopDictList(pageCondition, serviceDictInfo,intArr); + Page page = serviceDictInfoService.findTopDictList(pageCondition, serviceDictInfo,intArr); + + // 植入序号 for (int i = 0; i < page.getList().size(); i++) { page.getList().get(i).setShowSequence("" + (i + 1 + ((page.getPageNo() - 1) * page.getPageSize()))); @@ -129,7 +113,7 @@ public class ServiceDictInfoController extends BaseController { //处理下级序号 ServiceDictInfo.addChildrenSeq(list, 0); model.addAttribute("itType", itType); - model.addAttribute("intArr", Arrays.asList(intArr)); + model.addAttribute("intArr", intArr); model.addAttribute("list", list); return "/basics/serviceDictList"; } @@ -141,7 +125,7 @@ public class ServiceDictInfoController extends BaseController { * @param model * @return */ - @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR) + @RequiresPermissions(value={"basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classificationattribute:edit"},logical=Logical.OR) @RequestMapping(value={"form"}) public String form(ServiceDictInfo serviceDictInfo, Model model,String doAction,String itType) { if(doAction!=null&&doAction.equals("0")){ @@ -152,12 +136,8 @@ public class ServiceDictInfoController extends BaseController { parent.setServiceDictId(0); serviceDictInfo.setParent(parent); } - String[] strArr = itType.split("-"); - Integer[] intArr = new Integer[strArr.length]; - for(int i=0;i intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SERVICE_DICT_ITM_TYPE", ""), itType); + model.addAttribute("intArr", intArr); model.addAttribute("serviceDictInfo", serviceDictInfo); model.addAttribute("itType", itType); return "/basics/serviceDictForm"; @@ -236,10 +216,6 @@ public class ServiceDictInfoController extends BaseController { map.put("id", serviceDictInfo.getServiceDictId()); map.put("pId", serviceDictInfo.getParent().getServiceDictId()); map.put("name",serviceDictInfo.getItemValue()); - /*if(serviceDictInfo.getParent().getServiceDictId()!=0){ - ServiceDictInfo parent = serviceDictInfoService.getDictById(serviceDictInfo.getParent().getServiceDictId()); - //map.put("placeholder",parent.getItemType().toString()); - }*/ mapList.add(map); } @@ -296,7 +272,7 @@ public class ServiceDictInfoController extends BaseController { */ @ResponseBody @RequestMapping(value = "ajaxChildrenType") - public boolean ajaxChildrenType(Integer parent,Integer newItemType) { + public boolean ajaxChildrenType(Integer parent,Integer itemType) { if(parent==null){ return true; } @@ -306,7 +282,7 @@ public class ServiceDictInfoController extends BaseController { return true; }else{ for(ServiceDictInfo serviceDictInfo:list){ - if(serviceDictInfo.getItemType()==newItemType){ + if(serviceDictInfo.getItemType()==itemType){ return true; } } @@ -386,9 +362,8 @@ public class ServiceDictInfoController extends BaseController { return true; } }else{ - ServiceDictInfo c = serviceDictInfoService.getDictById(currentId); if(p.getLevelNo() list = serviceDictInfoService.getDictByParentId(currentId); if(list==null||list.size()==0){ return true; diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java index db6d8de25..fd7ef4ac5 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -1,6 +1,7 @@ package com.nis.web.controller.basics; import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -22,6 +23,7 @@ import com.google.common.collect.Maps; import com.nis.domain.Page; import com.nis.domain.basics.ServiceDictInfo; import com.nis.domain.basics.SysDictInfo; +import com.nis.util.ConfigDictUtils; import com.nis.util.Configurations; import com.nis.util.StringUtil; import com.nis.util.StringUtils; @@ -43,21 +45,6 @@ public class SysDictInfoController extends BaseController { } - /** - * 根据sysDictId查出配置对象 - * @param sysDictId - * @param request - * @param response - * @param model - * @return - */ - @ResponseBody - @RequestMapping(value = "loadDataDict") - public SysDictInfo loadDataDict(@RequestParam(required=false) Integer sysDictId,HttpServletRequest request, HttpServletResponse response, Model model){ - - return sysDictInfoService.getDictById(sysDictId); - } - /** * 查询业务辅助表-生效范围系统字典信息列表(无条件分页查询) @@ -71,13 +58,9 @@ public class SysDictInfoController extends BaseController { @RequestMapping(value = {"list", ""}) public String list(String itType, SysDictInfo sysDictInfo,HttpServletRequest request, HttpServletResponse response, Model model) { //处理数据 - String[] strArr = itType.split("-"); - Integer[] intArr = new Integer[strArr.length]; - for(int i=0;i intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SYS_DICT_ITM_TYPE", ""), itType); + if(intArr.size()==1){ + model.addAttribute("specType", intArr.get(0)); } String searchType = null; String searchContent = null; @@ -127,7 +110,7 @@ public class SysDictInfoController extends BaseController { //处理下级序号 SysDictInfo.addChildrenSeq(list, 0); model.addAttribute("itType", itType); - model.addAttribute("intArr", Arrays.asList(intArr)); + model.addAttribute("intArr", intArr); model.addAttribute("list", list); return "/basics/sysDictList"; } @@ -145,20 +128,16 @@ public class SysDictInfoController extends BaseController { model.addAttribute("specType", sysDictInfo.getItemType()); return "/basics/sysDictInfo"; } - if (sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null) { + if (sysDictInfo==null||sysDictInfo.getParent() == null || sysDictInfo.getParent().getSysDictId() == null) { SysDictInfo parent = new SysDictInfo(); parent.setSysDictId(0); sysDictInfo.setParent(parent); } - String[] strArr = itType.split("-"); - Integer[] intArr = new Integer[strArr.length]; - for(int i=0;i intArr = ConfigDictUtils.dealTypeCondition(Configurations.getStringProperty("SYS_DICT_ITM_TYPE", ""), itType); + if(intArr.size()==1){ + model.addAttribute("specType", intArr.get(0)); } - if(intArr.length==1){ - model.addAttribute("specType", intArr[0]); - } - model.addAttribute("intArr", Arrays.asList(intArr)); + model.addAttribute("intArr", intArr); model.addAttribute("sysDictInfo", sysDictInfo); model.addAttribute("itType", itType); return "/basics/sysDictForm"; @@ -298,7 +277,7 @@ public class SysDictInfoController extends BaseController { */ @ResponseBody @RequestMapping(value = "ajaxChildrenType") - public boolean ajaxChildrenType(Integer parent,Integer newItemType) { + public boolean ajaxChildrenType(Integer parent,Integer itemType) { if(parent==null){ return true; } @@ -308,7 +287,7 @@ public class SysDictInfoController extends BaseController { return true; }else{ for(SysDictInfo sysDictInfo:list){ - if(sysDictInfo.getItemType()==newItemType){ + if(sysDictInfo.getItemType()==itemType){ return true; } } @@ -388,14 +367,41 @@ public class SysDictInfoController extends BaseController { return true; } }else{ - SysDictInfo c = sysDictInfoService.getDictById(currentId); - if((p.getLevelNo()+c.getLevelNo())<(max+1)){ - return true; + if(p.getLevelNo() list = sysDictInfoService.getDictByParentId(currentId); + if(list==null||list.size()==0){ + return true; + } + List resultList = Lists.newArrayList(); + List intList = Lists.newArrayList(); + allTreeNode(1,list,resultList); + for(SysDictInfo se:resultList){ + intList.add(se.getLevelNo()); + } + int x = Collections.max(intList); + if((p.getLevelNo()+x)<(max+1)){ + return true; + } } } } return false; } - + /** + * 查出所该节点下有树形子节点 + */ + + private void allTreeNode(int levelNo, List list, List resultList) { + if(list!=null&&list.size()>0){ + for(SysDictInfo se:list){ + se.setLevelNo(levelNo+1); + resultList.add(se); + List newList = sysDictInfoService.getDictByParentId(se.getSysDictId()); + allTreeNode(se.getLevelNo(),newList,resultList); + } + } + + } } diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java index 03da7ab3c..fffea9bd1 100644 --- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.java @@ -13,34 +13,22 @@ import com.nis.web.dao.MyBatisDao; public interface ServiceDictInfoDao extends CrudDao { /** - * 查询顶层字典列表（==） + * 查询顶层字典列表 * @param serviceDictInfo * @return */ List findTopDictList(ServiceDictInfo serviceDictInfo); - /** - * 查询顶层字典列表（!=） - * @param serviceDictInfo - * @return - */ - List findTopDictListN(ServiceDictInfo serviceDictInfo); /** * findAllServiceDictInfo */ /** - * 查询所有字典列表（==） + * 查询所有符合条件的字典列表 * @param serviceDictInfo * @return */ List findAllServiceDictInfo(@Param("serviceDictInfo")ServiceDictInfo serviceDictInfo,@Param("orderBy")String orderBy); /** - * 查询所有字典列表（!=） - * @param serviceDictInfo - * @return - */ - List findAllServiceDictInfoN(@Param("serviceDictInfo")ServiceDictInfo serviceDictInfo,@Param("orderBy")String orderBy); - /** - * 查出所有有效数据 + * 查出所有有效数据父级(!=0) */ List findAllDictList(ServiceDictInfo serviceDictInfo); /** diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml index fbac199f3..2e29ff8b1 100644 --- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml @@ -72,10 +72,16 @@ - + - - - - + - - - - + SELECT @@ -59,10 +59,16 @@ WHERE s.is_valid =1 - + - - - - + - - - - +
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index 2804f8264..0adec297f 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/include/taglib.jsp"%> -配置信息 + @@ -81,6 +81,7 @@ $("#resetBtn").on("click",function(){ $(".Wdate").attr("value",''); $("#searchForm")[0].reset(); + $("#itemType").val(""); }); //筛选功能初始化 @@ -119,7 +120,9 @@

- + + +

@@ -140,6 +143,26 @@
+ + +
+
+
+ + + + + + + + + + +
+
+ + +
@@ -166,11 +189,13 @@ + + " href="javascript:;"> - +
@@ -257,7 +282,7 @@ - + @@ -276,7 +301,7 @@ ${sysDictInfo.itemValue} ${fns:abbr(sysDictInfo.itemDesc,15)} - + diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index a3728c108..8181c2ce7 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -43,7 +43,7 @@ if(mulitId!=""){ confirmx("", url+"?mulitId="+mulitId); }else{ - alert(""); + top.$.jBox.tip("", ""); } } //修改 diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp index 366d783f3..91f7f9cdd 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp @@ -226,10 +226,7 @@ function selectP(){
- ${not empty specificServiceHostCfg.hostId?'修改':'添加'} - - - +