gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决问题：

Browse Source 
0000022
基本配置-特征作用域
新增、修改界面，取消设置上级配置

0000021
基本配置-协议IP配置
数据列表界面：”协议id“一列显示为协议名称
数据列表界面：查询条件区域，协议id下拉列表改为协议名称下拉列表，源IP地址和目的IP地址改为输入框；
新增/修改界面：协议id改为协议名称，下拉列表选择有效协议名称；
新增/修改界面：源ip/目的ip掩码，源端口/目的端口掩码 缺省值在后台添加入库，用户填写时为非必填项


删除列表序列号，
This commit is contained in:
zhangshilin
2018-03-22 18:22:09 +08:00
parent 7ffdb1c002
commit 2d132d2b02
14 changed files with 147 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/util/ConfigDictUtils.java
View File

@@ -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;
}
}

3
src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
View File

@@ -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);

31
src/main/java/com/nis/web/controller/specific/SpecificServiceHostCfgController.java
View File

@@ -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;
}
}*/
}

6
src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.java
View File

@@ -24,12 +24,6 @@ public interface SpecificServiceHostCfgDao extends CrudDao<SpecificServiceHostCf
*/
List<SpecificServiceHostCfg> findSpecHostList(SpecificServiceHostCfg specificServiceHostCfg);
/**
* 查出所有
* @return
*/
List<SpecificServiceHostCfg> getAll();
/**
* 删除
* @param hostId

4
src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml
View File

@@ -122,10 +122,6 @@ select * from specific_service_host_cfg where is_valid = 1
</select>
<!-- 查询所有 -->
<select id="getAll" resultMap="specificServiceHostCfgResultMap">
select * from specific_service_host_cfg
</select>
<!-- 根据协议ID查询对象 -->
<select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceHostCfg" parameterType="java.lang.Integer">
select

44
src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java
View File

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.SysUser;
import com.nis.domain.specific.SpecificServiceHostCfg;
import com.nis.util.StringUtil;
import com.nis.web.dao.specific.SpecificServiceHostCfgDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -48,6 +49,40 @@ public class SpecificServiceHostCfgService extends BaseService{
*/
public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) {
SysUser user = UserUtils.getUser();
String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
String defaultIpMask = "";
if(specificServiceHostCfg.getIpType().equals(4)){
defaultIpMask = "255.255.255.255"; //255.255.255.255表示无掩码
}
if(specificServiceHostCfg.getIpType().equals(6)){
defaultIpMask = "FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; //FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码
}
String defaultPortMask = "65535"; //65535表示无掩码
//ip地址默认 缺省0.0.0.0值表示任意
if(StringUtil.isBlank(specificServiceHostCfg.getSrcIp())){
specificServiceHostCfg.setSrcIp(defaultIp);
}
if(StringUtil.isBlank(specificServiceHostCfg.getDstIp())){
specificServiceHostCfg.setDstIp(defaultIp);
}
//ip掩码默认
if(StringUtil.isBlank(specificServiceHostCfg.getSrcIpMask())){
specificServiceHostCfg.setSrcIpMask(defaultIpMask);
}
if(StringUtil.isBlank(specificServiceHostCfg.getDstIpMask())){
specificServiceHostCfg.setDstIpMask(defaultIpMask);
}
//端口掩码默认
if(StringUtil.isBlank(specificServiceHostCfg.getSrcPortMask())){
specificServiceHostCfg.setSrcPortMask(defaultPortMask);
}
if(StringUtil.isBlank(specificServiceHostCfg.getDstPortMask())){
specificServiceHostCfg.setDstPortMask(defaultPortMask);
}
//方向缺省
if(specificServiceHostCfg.getDirection()==null){
specificServiceHostCfg.setDirection(0);
}
Date date = new Date();
if(specificServiceHostCfg.getHostId()==null){//新增
specificServiceHostCfg.setIsValid(1);
@@ -73,15 +108,6 @@ public class SpecificServiceHostCfgService extends BaseService{
}
}
/**
* 查出所有
* @return
*/
public List<SpecificServiceHostCfg> getAll() {
return specificServiceHostCfgDao.getAll();
}
/**
* 删除
* @param mulitId