协议IP配置增加导入功能

src/main/java/com/nis/domain/ImportErrorInfo.java

@@ -0,0 +1,63 @@
+/**
+ * 
+ */
+package com.nis.domain;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName:ImportErrorInfo
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (zdx)
+ * @date 2018年4月25日 上午10:39:47
+ * @version V1.0
+ */
+public class ImportErrorInfo implements Serializable{
+	private static final long serialVersionUID = -8044793465646498657L;
+	private String rowNum;
+	private String fieldName;
+	private String errorMessage;
+	
+	public ImportErrorInfo() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+	
+	/**
+	 * @param rowNum 行号
+	 * @param fieldName 属性名称
+	 * @param errorMessage 错误信息
+	 */
+	public ImportErrorInfo(String rowNum, String fieldName, String errorMessage) {
+		super();
+		this.rowNum = rowNum;
+		this.fieldName = fieldName;
+		this.errorMessage = errorMessage;
+	}
+
+
+	public String getRowNum() {
+		return rowNum;
+	}
+	public void setRowNum(String rowNum) {
+		this.rowNum = rowNum;
+	}
+	public String getFieldName() {
+		return fieldName;
+	}
+	public void setFieldName(String fieldName) {
+		this.fieldName = fieldName;
+	}
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	@Override
+	public String toString() {
+		return "ImportErrorInfo [rowNum=" + rowNum + ", fieldName=" + fieldName
+				+ ", errorMessage=" + errorMessage + "]";
+	}
+	
+}

src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java

@@ -8,6 +8,7 @@ import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.domain.BaseEntity;
 import com.nis.domain.SysUser;
+import com.nis.util.excel.ExcelField;
 
 /**
  * 系统特定服务信息表-记录特定服务信息(specific_service_cfg)
@@ -20,6 +21,7 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	@Expose
 	@SerializedName("cfgId")
 	private Integer hostId; //host_id	配置ID	bigint	N	主键，自增
+	private String specServiceName;//协议名称，用于导入导出
 	private Integer specServiceId; //spec_service_id	协议id	int	N	protocol_info_cfg.protocol_id
 	@Expose
 	private Integer ipType; //ip地址类型 ipV4=4 ipV6=6
@@ -80,72 +82,84 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	public void setSpecServiceId(Integer specServiceId) {
 		this.specServiceId = specServiceId;
 	}
+	@ExcelField(title="ip_type",align=2,sort=20)
 	public Integer getIpType() {
 		return ipType;
 	}
 	public void setIpType(Integer ipType) {
 		this.ipType = ipType;
 	}
+	@ExcelField(title="client_ip",align=2,sort=30)
 	public String getSrcIp() {
 		return srcIp;
 	}
 	public void setSrcIp(String srcIp) {
 		this.srcIp = srcIp;
 	}
+	@ExcelField(title="client_address_mask",align=2,sort=40)
 	public String getSrcIpMask() {
 		return srcIpMask;
 	}
 	public void setSrcIpMask(String srcIpMask) {
 		this.srcIpMask = srcIpMask;
 	}
+	@ExcelField(title="client_port",align=2,sort=50)
 	public String getSrcPort() {
 		return srcPort;
 	}
 	public void setSrcPort(String srcPort) {
 		this.srcPort = srcPort;
 	}
+	@ExcelField(title="client_port_mask",align=2,sort=60)
 	public String getSrcPortMask() {
 		return srcPortMask;
 	}
 	public void setSrcPortMask(String srcPortMask) {
 		this.srcPortMask = srcPortMask;
 	}
+	@ExcelField(title="server_ip",align=2,sort=70)
 	public String getDstIp() {
 		return dstIp;
 	}
 	public void setDstIp(String dstIp) {
 		this.dstIp = dstIp;
 	}
+	@ExcelField(title="server_address_mask",align=2,sort=80)
 	public String getDstIpMask() {
 		return dstIpMask;
 	}
 	public void setDstIpMask(String dstIpMask) {
 		this.dstIpMask = dstIpMask;
 	}
+	@ExcelField(title="server_port",align=2,sort=90)
 	public String getDstPort() {
 		return dstPort;
 	}
 	public void setDstPort(String dstPort) {
 		this.dstPort = dstPort;
 	}
+	@ExcelField(title="server_port_mask",align=2,sort=100)
 	public String getDstPortMask() {
 		return dstPortMask;
 	}
 	public void setDstPortMask(String dstPortMask) {
 		this.dstPortMask = dstPortMask;
 	}
+	@ExcelField(title="direction",align=2,sort=110)
 	public Integer getDirection() {
 		return direction;
 	}
 	public void setDirection(Integer direction) {
 		this.direction = direction;
 	}
+	@ExcelField(title="protocol",align=2,sort=120)
 	public Integer getProtocol() {
 		return protocol;
 	}
 	public void setProtocol(Integer protocol) {
 		this.protocol = protocol;
 	}
+	@ExcelField(title="valid_identifier",type=1,align=2,sort=130)
 	public Integer getIsValid() {
 		return isValid;
 	}
@@ -164,6 +178,7 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	public void setCreator(SysUser creator) {
 		this.creator = creator;
 	}
+	@ExcelField(title="创建时间",type=1,align=2,sort=140)
 	public Date getCreateTime() {
 		return createTime;
 	}
@@ -233,6 +248,13 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	public void setAuditEndDate(Date auditEndDate) {
 		this.auditEndDate = auditEndDate;
 	}
+	@ExcelField(title="protocol_name",align=2,sort=10)
+	public String getSpecServiceName() {
+		return specServiceName;
+	}
+	public void setSpecServiceName(String specServiceName) {
+		this.specServiceName = specServiceName;
+	}
 	/**
 	 * 处理数据
 	 * @param list