(1)maat配置转换0.0.1版本jar提交,获取编译id可用,审核,取消审核部分报错,待凯歌修复完成测试通过之后更新版本。

(2)基础类配置精简后台代码,加入了从maat转换工具获取编译ID。审核,取消审核目前不可用,等jar包修复完成继续调整。
(3)编译ID字段改为int类型
(4)多域类配置后台提交。查询采用查一张主表,根据主表中的编译ID分开查其他表的方式关联。界面功能尚在调整。
This commit is contained in:
wangxin
2018-03-26 14:43:58 +08:00
parent bb8cd7be79
commit 9d50205d5f
38 changed files with 2392 additions and 905 deletions

View File

@@ -9,6 +9,7 @@
package com.nis.domain.maat;
import java.io.Serializable;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
@@ -35,28 +36,28 @@ public class MaatCfg implements Serializable {
private static final long serialVersionUID = -7745084076394247318L;
@Expose
@SerializedName("strCfg")
private BaseStringCfg[] strCfg;
private List<BaseStringCfg> strCfg;
@Expose
@SerializedName("ipCfg")
private BaseIpCfg[] ipCfg;
private List<BaseIpCfg> ipCfg;
@Expose
@SerializedName("numCfg")
private NumBoundaryCfg[] numCfg;
private List<NumBoundaryCfg> numCfg;
@Expose
@SerializedName("complexStrCfg")
private ComplexkeywordCfg[] complexStrCfg;
private List<ComplexkeywordCfg> complexStrCfg;
/**
* strCfg
* @return strCfg
*/
public BaseStringCfg[] getStrCfg() {
public List<BaseStringCfg> getStrCfg() {
return strCfg;
}
/**
* @param strCfg the strCfg to set
*/
public void setStrCfg(BaseStringCfg[] strCfg) {
public void setStrCfg(List<BaseStringCfg> strCfg) {
this.strCfg = strCfg;
}
/**
@@ -64,13 +65,13 @@ public class MaatCfg implements Serializable {
* @return ipCfg
*/
public BaseIpCfg[] getIpCfg() {
public List<BaseIpCfg> getIpCfg() {
return ipCfg;
}
/**
* @param ipCfg the ipCfg to set
*/
public void setIpCfg(BaseIpCfg[] ipCfg) {
public void setIpCfg(List<BaseIpCfg> ipCfg) {
this.ipCfg = ipCfg;
}
/**
@@ -78,13 +79,13 @@ public class MaatCfg implements Serializable {
* @return numCfg
*/
public NumBoundaryCfg[] getNumCfg() {
public List<NumBoundaryCfg> getNumCfg() {
return numCfg;
}
/**
* @param numCfg the numCfg to set
*/
public void setNumCfg(NumBoundaryCfg[] numCfg) {
public void setNumCfg(List<NumBoundaryCfg> numCfg) {
this.numCfg = numCfg;
}
/**
@@ -92,13 +93,13 @@ public class MaatCfg implements Serializable {
* @return complexStrCfg
*/
public ComplexkeywordCfg[] getComplexStrCfg() {
public List<ComplexkeywordCfg> getComplexStrCfg() {
return complexStrCfg;
}
/**
* @param complexStrCfg the complexStrCfg to set
*/
public void setComplexStrCfg(ComplexkeywordCfg[] complexStrCfg) {
public void setComplexStrCfg(List<ComplexkeywordCfg> complexStrCfg) {
this.complexStrCfg = complexStrCfg;
}

View File

@@ -37,7 +37,7 @@ public class ToMaatBean implements Serializable{
private static final long serialVersionUID = 5123156423588372849L;
@Expose
@SerializedName("serviceCfg")
private List<MaatCfg[]> serviceCfg;
private List<List<MaatCfg>> serviceCfg;
@Expose
@SerializedName("areaCfg")
private List<AreaIpCfg> areaCfg;
@@ -58,7 +58,7 @@ public class ToMaatBean implements Serializable{
private String lable;
@Expose
@SerializedName("compileId")
private Long compileId;
private Integer compileId;
@Expose
@SerializedName("isAreaEffective")
private Integer isAreaEffective;
@@ -72,18 +72,19 @@ public class ToMaatBean implements Serializable{
@SerializedName("serviceId")
private Integer serviceId;
/**
* serviceCfg
* @return serviceCfg
*/
public List<MaatCfg[]> getServiceCfg() {
public List<List<MaatCfg>> getServiceCfg() {
return serviceCfg;
}
/**
* @param serviceCfg the serviceCfg to set
*/
public void setServiceCfg(List<MaatCfg[]> serviceCfg) {
public void setServiceCfg(List<List<MaatCfg>> serviceCfg) {
this.serviceCfg = serviceCfg;
}
/**
@@ -176,13 +177,13 @@ public class ToMaatBean implements Serializable{
* @return compileId
*/
public Long getCompileId() {
public Integer getCompileId() {
return compileId;
}
/**
* @param compileId the compileId to set
*/
public void setCompileId(Long compileId) {
public void setCompileId(Integer compileId) {
this.compileId = compileId;
}
/**
@@ -242,22 +243,6 @@ public class ToMaatBean implements Serializable{
this.serviceId = serviceId;
}
public static void main(String[] args) {
Gson gson=new GsonBuilder().disableHtmlEscaping()
.setDateFormat("yyyy-MM-dd HH:mm:ss")
.setPrettyPrinting()/*.serializeNulls()*/
.excludeFieldsWithoutExposeAnnotation()
.create();
ToMaatBean bean=new ToMaatBean();
List<MaatCfg[]> cfg=new ArrayList<>();
MaatCfg[] ma=new MaatCfg[1];
MaatCfg mc=new MaatCfg();
IpPortCfg[] a=new IpPortCfg[1];
a[0]=new IpPortCfg();
mc.setIpCfg(a);
ma[0]=mc;
cfg.add(ma);
bean.setServiceCfg(cfg);
System.out.println(gson.toJson(bean));
}
}

View File

@@ -0,0 +1,51 @@
/**
*@Title: ToMaatBean.java
*@Package com.nis.domain.configuration
*@Description TODO
*@author dell
*@date 2018年2月28日 下午2:03:08
*@version 版本号
*/
package com.nis.domain.maat;
import java.io.Serializable;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
/**
* @ClassName: ToMaatBean.java
* @Description: TODO
* @author (dell)
* @date 2018年2月28日 下午2:03:08
* @version V1.0
*/
public class ToMaatUnAuditBean implements Serializable{
/**
* @Fields serialVersionUID:TODO转换为maat格式的java bean
*
* @since 1.0.0
*/
private static final long serialVersionUID = 5123156423588372849L;
@Expose
@SerializedName("serviceCfg")
private List<UnAuditBean> serviceCfg;
/**
* serviceCfg
* @return serviceCfg
*/
public List<UnAuditBean> getServiceCfg() {
return serviceCfg;
}
/**
* @param serviceCfg the serviceCfg to set
*/
public void setServiceCfg(List<UnAuditBean> serviceCfg) {
this.serviceCfg = serviceCfg;
}
}

View File

@@ -0,0 +1,66 @@
/**
*@Title: UnAuditBean.java
*@Package com.nis.domain.maat
*@Description TODO
*@author dell
*@date 2018年3月26日 下午1:30:07
*@version 版本号
*/
package com.nis.domain.maat;
import java.io.Serializable;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
/**
* @ClassName: UnAuditBean.java
* @Description: TODO
* @author (dell)
* @date 2018年3月26日 下午1:30:07
* @version V1.0
*/
public class UnAuditBean implements Serializable{
/**
* @Fields serialVersionUID:TODO用一句话描述这个变量表示什么
*
* @since 1.0.0
*/
private static final long serialVersionUID = -3497633085090859526L;
@Expose
@SerializedName("compileId")
private Integer compileId;
@Expose
@SerializedName("maatTable")
private String maatTable;
/**
* compileId
* @return compileId
*/
public Integer getCompileId() {
return compileId;
}
/**
* @param compileId the compileId to set
*/
public void setCompileId(Integer compileId) {
this.compileId = compileId;
}
/**
* maatTable
* @return maatTable
*/
public String getMaatTable() {
return maatTable;
}
/**
* @param maatTable the maatTable to set
*/
public void setMaatTable(String maatTable) {
this.maatTable = maatTable;
}
}