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

修改日志公共类属性名称

Browse Source
This commit is contained in:
dell
2018-07-03 12:46:06 +08:00
parent bc89b010ac
commit 54c8186177
2 changed files with 91 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
src/main/java/com/nis/domain/log/BaseLogEntity.java
View File

@@ -9,19 +9,19 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected Integer cfgId;
protected String foundTime; //发现时间，timestamp
protected String recvTime; //接收时间，timestamp
protected String protocol; //协议类型，从字典LOG_PROTOCOL取值
protected String TransProto; //协议类型，从字典LOG_PROTOCOL取值
protected Integer addrType; //ip地址类型，从字典IP_TYPE取值
protected String serverIp; //服务端ip地址
protected String clientIp; //客户端ip地址
protected String serverPort; //服务端ip端口
protected String clientPort; //客户端ip端口
protected Integer serviceType; //配置表的serviceId
protected String dIp; //服务端ip地址
protected String sIp; //客户端ip地址
protected String dPort; //服务端ip端口
protected String sPort; //客户端ip端口
protected Integer service; //配置表的serviceId
protected Integer entranceId; //出入口编号
protected Integer deviceId; //串联设备编号
protected Integer direction; //传输方向 0：域内->域外，1：域外->域内，从字典LOG_DIRECTION取值
protected Integer streamType; //流类型 0：c2s；1：s2c；2：double，从字典LOG_STREAMTYPE取值
protected String cljIp; //处理机IP
protected String nestAddrList; //嵌套地址列表
protected Integer streamDir; //流类型 0：c2s；1：s2c；2：double，从字典LOG_STREAMTYPE取值
protected String capIp; //处理机IP
protected String addrList; //嵌套地址列表
protected String userRegion; //用户自定义
protected Integer functionId;
@@ -32,18 +32,6 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
protected String searchFoundEndTime;//结束时间，格式同上
public Integer getAction() {
return action;
}
public void setAction(Integer action) {
this.action = action;
}
public Integer getFunctionId() {
return functionId;
}
public void setFunctionId(Integer functionId) {
this.functionId = functionId;
}
public String getFoundTime() {
return foundTime;
}
@@ -56,35 +44,17 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setRecvTime(String recvTime) {
this.recvTime = recvTime;
}
public String getSearchFoundStartTime() {
return searchFoundStartTime;
}
public void setSearchFoundStartTime(String searchFoundStartTime) {
this.searchFoundStartTime = searchFoundStartTime;
}
public String getSearchFoundEndTime() {
return searchFoundEndTime;
}
public void setSearchFoundEndTime(String searchFoundEndTime) {
this.searchFoundEndTime = searchFoundEndTime;
}
public String getSeltype() {
return seltype;
}
public void setSeltype(String seltype) {
this.seltype = seltype;
}
public Integer getCfgId() {
return cfgId;
}
public void setCfgId(Integer cfgId) {
this.cfgId = cfgId;
}
public String getProtocol() {
return protocol;
public String getTransProto() {
return TransProto;
}
public void setProtocol(String protocol) {
this.protocol = protocol;
public void setTransProto(String transProto) {
TransProto = transProto;
}
public Integer getAddrType() {
return addrType;
@@ -92,35 +62,35 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setAddrType(Integer addrType) {
this.addrType = addrType;
}
public String getServerIp() {
return serverIp;
public String getdIp() {
return dIp;
}
public void setServerIp(String serverIp) {
this.serverIp = serverIp;
public void setdIp(String dIp) {
this.dIp = dIp;
}
public String getClientIp() {
return clientIp;
public String getsIp() {
return sIp;
}
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
public void setsIp(String sIp) {
this.sIp = sIp;
}
public String getServerPort() {
return serverPort;
public String getdPort() {
return dPort;
}
public void setServerPort(String serverPort) {
this.serverPort = serverPort;
public void setdPort(String dPort) {
this.dPort = dPort;
}
public String getClientPort() {
return clientPort;
public String getsPort() {
return sPort;
}
public void setClientPort(String clientPort) {
this.clientPort = clientPort;
public void setsPort(String sPort) {
this.sPort = sPort;
}
public Integer getServiceType() {
return serviceType;
public Integer getService() {
return service;
}
public void setServiceType(Integer serviceType) {
this.serviceType = serviceType;
public void setService(Integer service) {
this.service = service;
}
public Integer getEntranceId() {
return entranceId;
@@ -140,23 +110,23 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setDirection(Integer direction) {
this.direction = direction;
}
public Integer getStreamType() {
return streamType;
public Integer getStreamDir() {
return streamDir;
}
public void setStreamType(Integer streamType) {
this.streamType = streamType;
public void setStreamDir(Integer streamDir) {
this.streamDir = streamDir;
}
public String getCljIp() {
return cljIp;
public String getCapIp() {
return capIp;
}
public void setCljIp(String cljIp) {
this.cljIp = cljIp;
public void setCapIp(String capIp) {
this.capIp = capIp;
}
public String getNestAddrList() {
return nestAddrList;
public String getAddrList() {
return addrList;
}
public void setNestAddrList(String nestAddrList) {
this.nestAddrList = nestAddrList;
public void setAddrList(String addrList) {
this.addrList = addrList;
}
public String getUserRegion() {
return userRegion;
@@ -164,17 +134,46 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setUserRegion(String userRegion) {
this.userRegion = userRegion;
}
public Integer getFunctionId() {
return functionId;
}
public void setFunctionId(Integer functionId) {
this.functionId = functionId;
}
public Integer getAction() {
return action;
}
public void setAction(Integer action) {
this.action = action;
}
public String getSeltype() {
return seltype;
}
public void setSeltype(String seltype) {
this.seltype = seltype;
}
public String getSearchFoundStartTime() {
return searchFoundStartTime;
}
public void setSearchFoundStartTime(String searchFoundStartTime) {
this.searchFoundStartTime = searchFoundStartTime;
}
public String getSearchFoundEndTime() {
return searchFoundEndTime;
}
public void setSearchFoundEndTime(String searchFoundEndTime) {
this.searchFoundEndTime = searchFoundEndTime;
}
@Override
public String toString() {
return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", protocol="
+ protocol + ", addrType=" + addrType + ", serverIp=" + serverIp + ", clientIp=" + clientIp
+ ", serverPort=" + serverPort + ", clientPort=" + clientPort + ", serviceType=" + serviceType
+ ", entranceId=" + entranceId + ", deviceId=" + deviceId + ", direction=" + direction + ", streamType="
+ streamType + ", cljIp=" + cljIp + ", nestAddrList=" + nestAddrList + ", userRegion=" + userRegion
return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", TransProto="
+ TransProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
+ addrList + ", userRegion=" + userRegion + ", functionId=" + functionId + ", action=" + action
+ ", seltype=" + seltype + ", searchFoundStartTime=" + searchFoundStartTime + ", searchFoundEndTime="
+ searchFoundEndTime + "]";
}
}

22
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -489,7 +489,7 @@ public class BaseController {
public void setLogAction(BaseLogEntity log) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
for (FunctionServiceDict dict : serviceList) {
if (dict.getServiceId().intValue() == log.getServiceType().intValue()) {
if (dict.getServiceId().intValue() == log.getService().intValue()) {
log.setAction(dict.getAction());
}
}
@@ -513,20 +513,20 @@ public class BaseController {
entry.setSearchFoundEndTime(endTime);
}
if (StringUtils.isNotBlank(entry.getProtocol())) {
params.put("searchTransProto", entry.getProtocol());
if (StringUtils.isNotBlank(entry.getTransProto())) {
params.put("searchTransProto", entry.getTransProto());
}
if (entry.getServiceType()!=null) {
params.put("searchService", entry.getServiceType());
if (entry.getService()!=null) {
params.put("searchService", entry.getService());
}
if (StringUtils.isNotBlank(entry.getServerIp())) {
params.put("searchDIp", entry.getServerIp());
if (StringUtils.isNotBlank(entry.getdIp())) {
params.put("searchDIp", entry.getdIp());
}
if (StringUtils.isNotBlank(entry.getClientIp())) {
params.put("searchSIp", entry.getClientIp());
if (StringUtils.isNotBlank(entry.getsIp())) {
params.put("searchSIp", entry.getsIp());
}
if (StringUtils.isNotBlank(entry.getCljIp())) {
params.put("searchCapIp", entry.getCljIp());
if (StringUtils.isNotBlank(entry.getCapIp())) {
params.put("searchCapIp", entry.getCapIp());
}
if (entry.getDirection()!=null) {
params.put("searchDirection", entry.getDirection());