ASN 版本恢复1月4号之版本

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -61,17 +61,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String exType;//导出类型
 	protected String hColumns;//导出隐藏列
 	
-	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
-	public String getCommonGroupIds() {
-		return commonGroupIds;
-	}
-	
-	public void setCommonGroupIds(String commonGroupIds) {
-		this.commonGroupIds = commonGroupIds;
-	}
-	
-	
-	
 	public String getExType() {
 		return exType;
 	}
@@ -130,13 +119,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 有效标识
 	 */
-	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=109)
+	@ExcelField(title="valid_identifier",dictType="VALID_IDENTIFIER",sort=90)
 	@Expose
 	protected Integer isValid;
 	/**
 	 * 是否审核
 	 */
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=37)
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
 	protected Integer isAudit;
 	/**
 	 * 创建人员

src/main/java/com/nis/domain/maat/GroupReuseAddBean.java

@@ -44,7 +44,7 @@ public class GroupReuseAddBean implements Serializable{
 	@Expose
 	private Integer opAction;
 	@Expose
-	@SerializedName("commonGroupList")
+	@SerializedName("groupReuseList")
 	private List<GroupReuseCfg> groupReuseCfgList;
 
 	public String getVersion() {

src/main/java/com/nis/domain/maat/GroupReuseCfg.java

@@ -14,7 +14,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
  *
  */
 public class GroupReuseCfg implements Serializable {
-	/*@Expose
+	@Expose
 	@SerializedName("service")
 	private Integer serviceId;
 	public Integer getServiceId() {
@@ -23,7 +23,7 @@ public class GroupReuseCfg implements Serializable {
 	public void setServiceId(Integer serviceId) {
 		this.serviceId = serviceId;
 	}
-*/	/**
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1830956100866313836L;

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -95,8 +95,6 @@ public class MaatCfg implements Serializable {
 	@Expose
 	@SerializedName("ipClientRangeList")
 	private List<IpCfg> areaIpRegionList;
-	@Expose
-	private List<GroupCfg> keepGroupList;
 	
 	public static class GroupCfg{
 		@Expose
@@ -106,8 +104,6 @@ public class MaatCfg implements Serializable {
 		@Expose
 		private Integer isValid;
 		@Expose
-		private Integer isCommonGroup;
-		@Expose
 		@SerializedName("opTime")
 		private Date auditTime;
 		public Integer getGroupId() {
@@ -134,12 +130,7 @@ public class MaatCfg implements Serializable {
 		public void setAuditTime(Date auditTime) {
 			this.auditTime = auditTime;
 		}
-		public Integer getIsCommonGroup() {
-			return isCommonGroup;
-		}
-		public void setIsCommonGroup(Integer isCommonGroup) {
-			this.isCommonGroup = isCommonGroup;
-		}
+		
 	}
 	public static class StringCfg{	
 		@Expose
@@ -688,13 +679,6 @@ public class MaatCfg implements Serializable {
 	public void setRequestId(Integer requestId) {
 		this.requestId = requestId;
 	}
-	
-	public List<GroupCfg> getKeepGroupList() {
-		return keepGroupList;
-	}
-	public void setKeepGroupList(List<GroupCfg> keepGroupList) {
-		this.keepGroupList = keepGroupList;
-	}
 	public void initDefaultValue() {
 		this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
 //		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;

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

@@ -23,21 +23,6 @@ public class ConfigGroupInfo implements Serializable{
 	@ExcelField(title="cfg_id",sort=301)
 	private Integer compileId;
 	private Long asnId;
-	private Integer isAuditAll; //是否有策略选择了此公共组下发所有；
-	private Integer isUsed; //是否有策略选择了此公共组；
-	
-	public Integer getIsUsed() {
-		return isUsed;
-	}
-	public void setIsUsed(Integer isUsed) {
-		this.isUsed = isUsed;
-	}
-	public Integer getIsAuditAll() {
-		return isAuditAll;
-	}
-	public void setIsAuditAll(Integer isAuditAll) {
-		this.isAuditAll = isAuditAll;
-	}
 	
 	public Long getAsnId() {
 		return asnId;