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

分类性质标签、地域运营商作用域：融合自定义显示，添加排序，优化代码，

Browse Source 
特定服务器管理：修正列表分页显示，条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验，
协议ip配置：修正条件查询，添加自定义显示，添加排序，新增修改页面添加表单校验（ipV4\ipV6地址及掩码校验，端口校验）
This commit is contained in:
zhangshilin
2018-03-21 13:43:43 +08:00
parent d5d708a492
commit f92ae2dda4
28 changed files with 710 additions and 1000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java
View File

@@ -52,14 +52,17 @@ public class SpecificServiceCfgService extends BaseService{
* @param specificServiceCfg
* @return
*/
public List<SpecificServiceCfg> findAllSpecificServiceCfg(SpecificServiceCfg specificServiceCfg) {
return specificServiceCfgDao.findAllSpecificServiceCfg(specificServiceCfg);
public List<SpecificServiceCfg> findAllSpecificServiceCfg(SpecificServiceCfg specificServiceCfg, String orderBy) {
return specificServiceCfgDao.findAllSpecificServiceCfg(specificServiceCfg,orderBy);
}
/**
* 保存或修改
* @param specificServiceCfg
*/
public void saveOrUpdate(SpecificServiceCfg specificServiceCfg, Integer oldId) {
if(specificServiceCfg.getGroupId()==null){
specificServiceCfg.setGroupId(0);
}
if(oldId==null){//新增
specificServiceCfg.setIsValid(1);
specificServiceCfg.setOpTime(new Date());
@@ -94,7 +97,7 @@ public class SpecificServiceCfgService extends BaseService{
List<SpecificServiceCfg> list = Lists.newArrayList();
//找出所有下级
if(specificServiceCfg!=null){
SpecificServiceCfg.sortList(list, specificServiceCfgDao.findAllSpecificServiceCfg(new SpecificServiceCfg()), specificServiceCfg.getSpecServiceId(), true);
SpecificServiceCfg.sortList(list, specificServiceCfgDao.findAllSpecificServiceCfg(new SpecificServiceCfg(),""), specificServiceCfg.getSpecServiceId(), true);
list.add(specificServiceCfg);
for(SpecificServiceCfg ss:list){
ss.setIsValid(0);

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

@@ -55,16 +55,20 @@ public class SpecificServiceHostCfgService extends BaseService{
specificServiceHostCfg.setCreateTime(date);
specificServiceHostCfg.setEditor(user);
specificServiceHostCfg.setEditTime(date);
specificServiceHostCfg.setAuditor(user);
specificServiceHostCfg.setAuditTime(date);
specificServiceHostCfgDao.insert(specificServiceHostCfg);
}else{//修改
//是否进行了审核操作
SpecificServiceHostCfg ssh = specificServiceHostCfgDao.getByHostId(specificServiceHostCfg.getHostId());
if(ssh.getIsAudit()!=specificServiceHostCfg.getIsAudit()){
//SpecificServiceHostCfg ssh = specificServiceHostCfgDao.getByHostId(specificServiceHostCfg.getHostId());
/*if(ssh.getIsAudit()!=specificServiceHostCfg.getIsAudit()){
specificServiceHostCfg.setAuditor(user);
specificServiceHostCfg.setAuditTime(date);
}
}*/
specificServiceHostCfg.setEditor(user);
specificServiceHostCfg.setEditTime(date);
specificServiceHostCfg.setAuditor(user);
specificServiceHostCfg.setAuditTime(date);
specificServiceHostCfgDao.update(specificServiceHostCfg);
}
}
@@ -90,6 +94,16 @@ public class SpecificServiceHostCfgService extends BaseService{
}
}
}
/**
* 根据协议ID查询对象
* @param specServiceId
* @return
*/
public SpecificServiceHostCfg getBySpecServiceId(Integer specServiceId) {
return specificServiceHostCfgDao.getBySpecServiceId(specServiceId);
}