解决问题:
0000022 基本配置-特征作用域 新增、修改界面,取消设置上级配置 0000021 基本配置-协议IP配置 数据列表界面:”协议id“一列显示为协议名称 数据列表界面:查询条件区域,协议id下拉列表改为协议名称下拉列表,源IP地址和目的IP地址改为输入框; 新增/修改界面:协议id改为协议名称,下拉列表选择有效协议名称; 新增/修改界面:源ip/目的ip掩码,源端口/目的端口掩码 缺省值在后台添加入库,用户填写时为非必填项 删除列表序列号,
This commit is contained in:
@@ -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<SpecificServiceHostCfg> page = specificServiceHostCfgService.findSpecHostList(new Page<SpecificServiceHostCfg>(request, response), specificServiceHostCfg);
|
||||
model.addAttribute("page", page);
|
||||
//查出所有
|
||||
List<SpecificServiceHostCfg> list = specificServiceHostCfgService.getAll();
|
||||
List<Integer> listSpecServiceId = Lists.newArrayList();
|
||||
List<String> listSrcIp = Lists.newArrayList();
|
||||
List<String> 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<SpecificServiceCfg> 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<SpecificServiceCfg> 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;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user