diff --git a/src/main/java/com/nis/util/ConfigDictUtils.java b/src/main/java/com/nis/util/ConfigDictUtils.java index 8ce743a12..1bb59471e 100644 --- a/src/main/java/com/nis/util/ConfigDictUtils.java +++ b/src/main/java/com/nis/util/ConfigDictUtils.java @@ -52,8 +52,8 @@ public class ConfigDictUtils { } /** - * 根据主键查询配置详情 - * @param sysDictId + * 根据主键查询特定服务协议对象 + * @param specServiceId * @return */ public static SpecificServiceCfg getBySpecServiceId(Integer specServiceId){ @@ -97,5 +97,6 @@ public class ConfigDictUtils { } return result; } + } 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 1a38e57a2..bd424e66b 100644 --- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java @@ -146,6 +146,7 @@ public class SysDictInfoController extends BaseController { @RequestMapping(value={"form"}) public String form(SysDictInfo sysDictInfo, Model model, String doAction, String itType, String mulitId) { if(doAction!=null&&doAction.equals("0")){ + model.addAttribute("specType", sysDictInfo.getItemType()); return "/basics/sysDictInfo"; } Integer id=0; @@ -291,7 +292,7 @@ public class SysDictInfoController extends BaseController { @ResponseBody @RequestMapping(value = "ajaxType") public boolean ajaxType(Integer parent,Integer child) { - if(parent==-1||parent==0){ + if(parent==null||parent==-1||parent==0){ return true; } SysDictInfo p = sysDictInfoService.getDictById(parent); diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java index 2b649b788..d437ea461 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java @@ -18,6 +18,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.google.common.collect.Lists; import com.nis.domain.Page; +import com.nis.domain.specific.SpecificServiceCfg; import com.nis.domain.specific.SpecificServiceHostCfg; import com.nis.util.StringUtil; import com.nis.web.controller.BaseController; @@ -52,25 +53,9 @@ public class SpecificServiceHostCfgController extends BaseController { //查出分页数据 Page page = specificServiceHostCfgService.findSpecHostList(new Page(request, response), specificServiceHostCfg); model.addAttribute("page", page); - //查出所有 - List list = specificServiceHostCfgService.getAll(); - List listSpecServiceId = Lists.newArrayList(); - List listSrcIp = Lists.newArrayList(); - List listDstIp = Lists.newArrayList(); - for(SpecificServiceHostCfg ssh:list){ - if(ssh!=null&&ssh.getSpecServiceId()!=null&&(!listSpecServiceId.contains(ssh.getSpecServiceId()))){ - listSpecServiceId.add(ssh.getSpecServiceId()); - } - if(ssh!=null&&ssh.getSrcIp()!=null&&(!listSrcIp.contains(ssh.getSrcIp()))){ - listSrcIp.add(ssh.getSrcIp()); - } - if(ssh!=null&&ssh.getDstIp()!=null&&(!listDstIp.contains(ssh.getDstIp()))){ - listDstIp.add(ssh.getDstIp()); - } - } - model.addAttribute("listSpecServiceId", listSpecServiceId); - model.addAttribute("listSrcIp", listSrcIp); - model.addAttribute("listDstIp", listDstIp); + //查询特定服务管理（specific_service_cfg）协议id供下拉选择 + List listSpecService = specificServiceCfgService.findAllSpecificServiceCfg(new SpecificServiceCfg(), "spec_service_id DESC"); + model.addAttribute("listSpecService", listSpecService); return "/specific/specificServiceHostCfgList"; } @@ -85,7 +70,9 @@ public class SpecificServiceHostCfgController extends BaseController { @RequiresPermissions("sys:dict:view") @RequestMapping(value = "form") public String form(SpecificServiceHostCfg specificServiceHostCfg, HttpServletRequest request, HttpServletResponse response, Model model) { - + //查询协议id供下拉选择 + List listSpecService = specificServiceCfgService.findAllSpecificServiceCfg(new SpecificServiceCfg(), "spec_service_id DESC"); + model.addAttribute("listSpecService", listSpecService); return "/specific/specificServiceHostCfgForm"; } @@ -132,7 +119,7 @@ public class SpecificServiceHostCfgController extends BaseController { * @param newId * @param oldId */ - @ResponseBody +/* @ResponseBody @RequestMapping(value = "isSpecServiceIdRepeat") public boolean isSpecServiceIdRepeat(String newId,String oldId){ if(oldId!=null){ @@ -145,5 +132,5 @@ public class SpecificServiceHostCfgController extends BaseController { } } return false; - } + }*/ } diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java index e8aa88702..1139345fa 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java @@ -24,12 +24,6 @@ public interface SpecificServiceHostCfgDao extends CrudDao findSpecHostList(SpecificServiceHostCfg specificServiceHostCfg); - /** - * 查出所有 - * @return - */ - List getAll(); - /** * 删除 * @param hostId diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml index 0cf4fd69a..68b591a23 100644 --- a/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml +++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml @@ -122,10 +122,6 @@ select * from specific_service_host_cfg where is_valid = 1 - - - - - - - - -
- - <%--
- - 数据类型 - - - - - >${dict.itemValue} - - - - -
--%> - -
-
-
- -
- - - -
- -
- -
-
- -
- -
- -
- - - - - - -
-
- - - - - - -
-
- -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
-
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
-
- -
-
- -
- - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号 -
${serviceDictInfo.showSequence}${serviceDictInfo.itemCode}${serviceDictInfo.itemValue}${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 diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 7c3862c82..caee8722c 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -250,7 +250,7 @@ - 序号 + @@ -267,7 +267,7 @@ - ${serviceDictInfo.showSequence} + <%-- ${serviceDictInfo.showSequence} --%> ${serviceDictInfo.itemCode} ${serviceDictInfo.itemValue} ${fns:abbr(serviceDictInfo.itemDesc,15)} diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp index ebfd50c06..1b837f4ea 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp @@ -200,6 +200,7 @@ +
@@ -207,6 +208,7 @@ title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
+
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp index 96013f688..2c40b165e 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfo.jsp @@ -38,12 +38,14 @@ +
+ <%--
@@ -68,12 +70,14 @@
+
+ <%--
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp deleted file mode 100644 index e0aa9b040..000000000 --- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp +++ /dev/null @@ -1,316 +0,0 @@ -<%@ page contentType="text/html;charset=UTF-8"%> -<%@ include file="/WEB-INF/include/taglib.jsp"%> - - -配置信息 - -<%-- --%> - - - - - - -
- - -

- ${fns:getItemTypeByNo("SYS_DICT_ITM_TYPE",intArr)} - -

- -
-
-
-
- -
- -
- - - - - - - - -
- - <%--
- - 数据类型 - - - - - >${dict.itemValue} - - - - -
--%> - -
-
-
- -
- - - -
- -
- -
-
- -
- -
- -
- - - - - - -
-
- - - - - - -
-
- -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
-
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
- -
-
- " onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/> -
-
-
- -
-
- -
- - -
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
序号 -
${sysDictInfo.showSequence}${sysDictInfo.itemCode}${sysDictInfo.itemValue}${fns:abbr(sysDictInfo.itemDesc,15)}${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")} - ${fns:getUserById(sysDictInfo.sysDictCreator.id).name} - - ${fns:getUserById(sysDictInfo.sysDictEditor.id).name} - -
- -
    -
    • - -
    • -     - -
    • -     - -
-
-
-
${page}
-
-
-
-
-
- - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index add84e0b9..ac09e3345 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -253,7 +253,7 @@ - 序号 + @@ -272,7 +272,7 @@ - ${sysDictInfo.showSequence} + <%-- ${sysDictInfo.showSequence} --%> ${sysDictInfo.itemCode} ${sysDictInfo.itemValue} ${fns:abbr(sysDictInfo.itemDesc,15)} diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp index 6c04c00bf..34ef50216 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp @@ -7,37 +7,46 @@