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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
chenjinsong
2018-03-22 14:41:33 +08:00
parent 659dc9fc2c 19d346e2de
commit 5a82405825
79 changed files with 5111 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/main/java/com/nis/domain/specific/SpecificServiceCfg.java Normal file
View File

@@ -0,0 +1,154 @@
package com.nis.domain.specific;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.domain.BaseEntity;
import com.nis.util.Configurations;
/**
* 系统特定服务信息表-记录特定服务信息(specific_service_cfg)
* @author zsl
*
*/
public class SpecificServiceCfg extends BaseEntity<SpecificServiceCfg>{
private static final long serialVersionUID = -1133644323636425766L;
private Integer specServiceId; //spec_service_id 协议ID int N 主键，初始化
//private Integer specServiceCode; //协议编码 int N 暂定，以后可扩展 1000：微信 , 1001：QQ
private String specServiceName; //spec_service_name 协议名称 varchar(64) N
private String specServiceDesc; //spec_service_desc 协议描述 varchar2(64) N
private Integer isValid; //is_valid 有效标志 int N 1-有效 0-无效
private Date opTime; //op_time 操作时间 date N
private SpecificServiceCfg parent; //parent_id 父节点id int N 0表示一级节点
private Integer isLeaf; //is_leaf 是否是叶子节点 int N 0否，1是，只有一级填0
private Integer groupId; //group_id maat端配置分组id int N 缺省0，表示未与maat分组同步
private Date beginDate; // 开始日期
private Date endDate; // 结束日期
private String showSequence; //显示序号
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public String getSpecServiceName() {
return specServiceName;
}
public void setSpecServiceName(String specServiceName) {
this.specServiceName = specServiceName;
}
public String getSpecServiceDesc() {
return specServiceDesc;
}
public void setSpecServiceDesc(String specServiceDesc) {
this.specServiceDesc = specServiceDesc;
}
public Integer getIsValid() {
return isValid;
}
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Date getOpTime() {
return opTime;
}
public void setOpTime(Date opTime) {
this.opTime = opTime;
}
public SpecificServiceCfg getParent() {
return parent;
}
public void setParent(SpecificServiceCfg parent) {
this.parent = parent;
}
public Integer getIsLeaf() {
return isLeaf;
}
public void setIsLeaf(Integer isLeaf) {
this.isLeaf = isLeaf;
}
public Integer getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
}
public Date getBeginDate() {
return beginDate;
}
public void setBeginDate(Date beginDate) {
this.beginDate = beginDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public String getShowSequence() {
return showSequence;
}
public void setShowSequence(String showSequence) {
this.showSequence = showSequence;
}
@JsonIgnore
public static void sortList(List<SpecificServiceCfg> list, List<SpecificServiceCfg> allList, Integer parentId, boolean cascade) {
for(int i=0;i<allList.size();i++){
SpecificServiceCfg ss = allList.get(i);
System.out.println("处理"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId()+"条件》》"+parentId);
if(ss!=null&&ss.getParent()!=null&&ss.getParent().getSpecServiceId()!=null&&ss.getParent().getSpecServiceId().equals(parentId)){
list.add(ss);
System.out.println("list加入"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId());
if(cascade){
for(int j=0;j<allList.size();j++){
SpecificServiceCfg child = allList.get(j);
if(child!=null&&child.getParent()!=null&&child.getParent().getSpecServiceId()!=null&&child.getParent().getSpecServiceId().equals(ss.getSpecServiceId())){
sortList(list,allList,ss.getSpecServiceId(),true);
break;
}
}
}
}
}
}
//处理下级序号
public static void addChildrenSeq(List<SpecificServiceCfg> list,Integer parentId){
int countNo = 1;
for(int i=0; i<list.size(); i++){
SpecificServiceCfg ss = list.get(i);
if(ss.getParent()!=null && ss.getParent().getSpecServiceId()!=null
&& ss.getParent().getSpecServiceId().equals(parentId)){
//找出该父类
for(SpecificServiceCfg se:list){
if(se.getSpecServiceId()==parentId){
ss.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
countNo++;
}
}
//继续获取子节点
for (int j=0; j<list.size(); j++){
SpecificServiceCfg child = list.get(j);
if (child.getParent()!=null && child.getParent().getSpecServiceId()!=null
&& child.getParent().getSpecServiceId().equals(ss.getSpecServiceId())){
addChildrenSeq(list, ss.getSpecServiceId());
break;
}
}
}
}
}
}

236
src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java Normal file
View File

@@ -0,0 +1,236 @@
package com.nis.domain.specific;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.domain.BaseEntity;
import com.nis.domain.SysUser;
/**
* 系统特定服务信息表-记录特定服务信息(specific_service_cfg)
* @author zsl
*
*/
public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
private static final long serialVersionUID = -301627652860717175L;
private Integer hostId; //host_id 配置ID bigint N 主键，自增
private Integer specServiceId; //spec_service_id 协议id int N protocol_info_cfg.protocol_id
private Integer ipType; //ip地址类型 ipV4=4 ipV6=6
private String srcIp; //src_ip 源IP地址 varchar(64) N 缺省0.0.0.0值表示任意
private String srcIpMask; //src_ip_mask 源地址掩码 varchar(64) N IPV4:255.255.255.255表示无掩码，即精确IP匹配，0.0.0.0值表示任意；
//IPV6：FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF表示无掩码，::（两个半角冒号）表示任意。非0掩码值必须是2的指数幂，下同。
private String srcPort; //src_port 源端口 varchar(6) N 0表示任意值
private String srcPortMask; //src_port_mask 源端口掩码 varchar(6) N 65535表示无掩码，即精确端口匹配，0表示任意
private String dstIp; //dst_ip 目的IP地址 varchar(64) N 缺省0.0.0.0值表示任意
private String dstIpMask; //dst_ip_mask 目的地址掩码 varchar(64) N 同源ip地址掩码
private String dstPort; //dst_port 目的端口 varchar(6) N 目的端口,0表示任意值
private String dstPortMask; //dst_port_mask 目的端口掩码 varchar(6) N 同源端口掩码
private Integer direction;; //direction 方向 int N 0双向，1单向，默认缺省为双向。
private Integer protocol; //protocol 协议 int N 6表示tcp,17表示udp，0表示任意
private Integer isValid; //is_valid 有效标识 int N 0无效，1有效
private Integer isAudit; //is_audit 是否审核 int N 0未审核，1审核通过，2审核未通过，3取消审核通过（即删除）
private SysUser creator; //creator_id 创建人员 int N 取自sys_user.id
private Date createTime; //create_time 配置时间 date N
private SysUser editor; //editor_id 修改人员 int Y 取自sys_user.id
private Date editTime; //edit_time 修改时间 date Y
private SysUser auditor; //auditor_id 审核人员 int Y 取自sys_user.id
private Date auditTime; //audit_time 审核时间 date Y
private Date beginDate;
private Date endDate;
private Date editBeginDate;
private Date editEndDate;
private Date auditBeginDate;
private Date auditEndDate;
public Integer getHostId() {
return hostId;
}
public void setHostId(Integer hostId) {
this.hostId = hostId;
}
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public Integer getIpType() {
return ipType;
}
public void setIpType(Integer ipType) {
this.ipType = ipType;
}
public String getSrcIp() {
return srcIp;
}
public void setSrcIp(String srcIp) {
this.srcIp = srcIp;
}
public String getSrcIpMask() {
return srcIpMask;
}
public void setSrcIpMask(String srcIpMask) {
this.srcIpMask = srcIpMask;
}
public String getSrcPort() {
return srcPort;
}
public void setSrcPort(String srcPort) {
this.srcPort = srcPort;
}
public String getSrcPortMask() {
return srcPortMask;
}
public void setSrcPortMask(String srcPortMask) {
this.srcPortMask = srcPortMask;
}
public String getDstIp() {
return dstIp;
}
public void setDstIp(String dstIp) {
this.dstIp = dstIp;
}
public String getDstIpMask() {
return dstIpMask;
}
public void setDstIpMask(String dstIpMask) {
this.dstIpMask = dstIpMask;
}
public String getDstPort() {
return dstPort;
}
public void setDstPort(String dstPort) {
this.dstPort = dstPort;
}
public String getDstPortMask() {
return dstPortMask;
}
public void setDstPortMask(String dstPortMask) {
this.dstPortMask = dstPortMask;
}
public Integer getDirection() {
return direction;
}
public void setDirection(Integer direction) {
this.direction = direction;
}
public Integer getProtocol() {
return protocol;
}
public void setProtocol(Integer protocol) {
this.protocol = protocol;
}
public Integer getIsValid() {
return isValid;
}
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Integer getIsAudit() {
return isAudit;
}
public void setIsAudit(Integer isAudit) {
this.isAudit = isAudit;
}
public SysUser getCreator() {
return creator;
}
public void setCreator(SysUser creator) {
this.creator = creator;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public SysUser getEditor() {
return editor;
}
public void setEditor(SysUser editor) {
this.editor = editor;
}
public Date getEditTime() {
return editTime;
}
public void setEditTime(Date editTime) {
this.editTime = editTime;
}
public SysUser getAuditor() {
return auditor;
}
public void setAuditor(SysUser auditor) {
this.auditor = auditor;
}
public Date getAuditTime() {
return auditTime;
}
public void setAuditTime(Date auditTime) {
this.auditTime = auditTime;
}
public Date getBeginDate() {
return beginDate;
}
public void setBeginDate(Date beginDate) {
this.beginDate = beginDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
public Date getEditBeginDate() {
return editBeginDate;
}
public void setEditBeginDate(Date editBeginDate) {
this.editBeginDate = editBeginDate;
}
public Date getEditEndDate() {
return editEndDate;
}
public void setEditEndDate(Date editEndDate) {
this.editEndDate = editEndDate;
}
public Date getAuditBeginDate() {
return auditBeginDate;
}
public void setAuditBeginDate(Date auditBeginDate) {
this.auditBeginDate = auditBeginDate;
}
public Date getAuditEndDate() {
return auditEndDate;
}
public void setAuditEndDate(Date auditEndDate) {
this.auditEndDate = auditEndDate;
}
/**
* 处理数据
* @param list
* @param sourceList
* @param ParentId
* @param cascade
*/
@JsonIgnore
public static void sort(List<SpecificServiceHostCfg> list, List<SpecificServiceHostCfg> sourceList, Integer ParentId, boolean cascade){
}
}