diff --git a/pom.xml b/pom.xml index 02eb9c8ae..c00d520a3 100644 --- a/pom.xml +++ b/pom.xml @@ -638,8 +638,10 @@ cglib 3.1 - + + com.google.code.gson + gson + 2.8.0 + - - diff --git a/src/main/java/com/nis/domain/SysRole.java b/src/main/java/com/nis/domain/SysRole.java index 23697b938..4b15138a5 100644 --- a/src/main/java/com/nis/domain/SysRole.java +++ b/src/main/java/com/nis/domain/SysRole.java @@ -47,7 +47,7 @@ public class SysRole extends BaseEntity{ /** * 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据； - * 6：所在部门及以下数据；7：所在部门数据,8:配置员，9：审核员） + * 6：所在部门及以下数据；7：所在部门数据,8:配置员，9：审核员，10：审计员） */ public static final Integer DATA_SCOPE_ALL = 1; @@ -59,6 +59,7 @@ public class SysRole extends BaseEntity{ public static final Integer DATA_SCOPE_ENTITY = 7; public static final Integer DATA_SCOPE_CREATOR = 8; public static final Integer DATA_SCOPE_AUDITOR = 9; + public static final Integer DATA_SCOPE_SHOWER = 10; diff --git a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java index 4cd60e842..6e62ddca4 100644 --- a/src/main/java/com/nis/domain/configuration/AreaIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/AreaIpCfg.java @@ -23,6 +23,24 @@ public class AreaIpCfg extends BaseIpCfg { */ private static final long serialVersionUID = 2367503808235405524L; + + /* (是否区域gk对此表无意义，直接设置0值) + * @see com.nis.domain.configuration.BaseCfg#setIsAreaEffective(java.lang.Integer) + */ + @Override + public void setIsAreaEffective(Integer isAreaEffective) { + // TODO Auto-generated method stub + this.isAreaEffective=0; + } + + /* (区域生效id对此表无意义，直接设置null值) + * @see com.nis.domain.configuration.BaseCfg#setAreaEffectiveIds(java.lang.String) + */ + @Override + public void setAreaEffectiveIds(String areaEffectiveIds) { + // TODO Auto-generated method stub + this.areaEffectiveIds=null; + } /* (non-Javadoc) * @see com.nis.domain.configuration.BaseIpCfg#initDefaultValue() diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 5d3449edb..e02483662 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -10,6 +10,8 @@ package com.nis.domain.configuration; import java.util.Date; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; import com.nis.domain.BaseEntity; /** @@ -21,6 +23,9 @@ import com.nis.domain.BaseEntity; */ public class BaseCfg extends BaseEntity { protected String tableName; + @Expose + @SerializedName("maatTable") + protected String maatTable; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -519,5 +524,19 @@ public class BaseCfg extends BaseEntity { public void setRequestName(String requestName) { this.requestName = requestName; } + /** + * maatTable + * @return maatTable + */ + + public String getMaatTable() { + return maatTable; + } + /** + * @param maatTable the maatTable to set + */ + public void setMaatTable(String maatTable) { + this.maatTable = maatTable; + } } diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java index 040d53a91..67ea4bdd9 100644 --- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java @@ -8,6 +8,9 @@ */ package com.nis.domain.configuration; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + /** * @ClassName: BaseIpConfig.java * @Description: 基础IP配置 @@ -26,50 +29,74 @@ public class BaseIpCfg extends BaseCfg { /** * ip类型 */ + @Expose + @SerializedName("ipType") protected Integer ipType; /** * 源IP地址 */ + @Expose + @SerializedName("srcIp") protected String srcIp ; /** * 源地址掩码 */ + @Expose + @SerializedName("srcIpMask") protected String srcIpMask ; /** * 源端口 */ + @Expose + @SerializedName("srcPort") protected String srcPort ; /** * 源端口掩码 */ + @Expose + @SerializedName("srcPortMask") protected String srcPortMask ; /** * 目的IP地址 */ + @Expose + @SerializedName("dstIp") protected String dstIp ; /** * 目的地址掩码 */ + @Expose + @SerializedName("dstIpMask") protected String dstIpMask ; /** * 目的端口 */ + @Expose + @SerializedName("dstPort") protected String dstPort ; /** * 目的端口掩码 */ + @Expose + @SerializedName("dstPortMask") protected String dstPortMask ; /** * 方向 */ + @Expose + @SerializedName("direction") protected Integer direction ; /** * 方向 */ + @Expose + @SerializedName("protocol") protected Integer protocol ; /** * 协议ID */ + @Expose + @SerializedName("protocolId") protected Integer protocolId ; /** * 编译id diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index c6cb594a7..47644c805 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -8,6 +8,9 @@ */ package com.nis.domain.configuration; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + /** * @ClassName: BaseStringConfig.java * @Description: 基础字符串类配置 @@ -27,6 +30,8 @@ public class BaseStringCfg extends BaseCfg { /** * 配置关键字 */ + @Expose + @SerializedName("keywords") protected String cfgKeywords; /** * cfgKeywords @@ -49,14 +54,20 @@ public class BaseStringCfg extends BaseCfg { /** * 表达式类型 */ + @Expose + @SerializedName("exprType") protected Integer exprType ; /** * 匹配方式 */ + @Expose + @SerializedName("matchMethod") protected Integer matchMethod ; /** * 是否hex二进制 */ + @Expose + @SerializedName("isHexbin") protected Integer isHexbin; /** diff --git a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java index ff87ee0da..e97195218 100644 --- a/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/ComplexkeywordCfg.java @@ -8,6 +8,9 @@ */ package com.nis.domain.configuration; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + /** * @ClassName: BaseEnhancedStringConfig.java * @Description: 基础增强字符串类配置 @@ -27,10 +30,14 @@ public class ComplexkeywordCfg extends BaseCfg{ /** * 匹配区域 */ + @Expose + @SerializedName("district") protected String district ; /** * 关键字 */ + @Expose + @SerializedName("keywords") protected String keywords; /** * 编译id @@ -39,14 +46,20 @@ public class ComplexkeywordCfg extends BaseCfg{ /** * 表达式类型 */ + @Expose + @SerializedName("exprType") protected Integer exprType ; /** * 匹配方式 */ + @Expose + @SerializedName("matchMethod") protected Integer matchMethod ; /** * 是否hex二进制 */ + @Expose + @SerializedName("isHexbin") protected Integer isHexbin ; /** * district diff --git a/src/main/java/com/nis/domain/configuration/IpPortCfg.java b/src/main/java/com/nis/domain/configuration/IpPortCfg.java index 0933d93f1..0aa5dcae4 100644 --- a/src/main/java/com/nis/domain/configuration/IpPortCfg.java +++ b/src/main/java/com/nis/domain/configuration/IpPortCfg.java @@ -34,5 +34,13 @@ public class IpPortCfg extends BaseIpCfg { super.initDefaultValue(); this.protocolId = 0; } + /** + * 此表固定写0 + */ + @Override + public void setProtocolId(Integer protocolId) { + // TODO Auto-generated method stub + super.setProtocolId(0); + } } diff --git a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java index 47ecd12d4..f00eec491 100644 --- a/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java +++ b/src/main/java/com/nis/domain/configuration/NumBoundaryCfg.java @@ -8,6 +8,9 @@ */ package com.nis.domain.configuration; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + /** * @ClassName: NumBoundaryConfig.java * @Description: TODO @@ -27,23 +30,15 @@ public class NumBoundaryCfg extends BaseCfg { /** * 数值下界 */ + @Expose + @SerializedName("lowBounadry") protected Long lowBounadry; /** * 数值上界 */ + @Expose + @SerializedName("upBoundary") protected Long upBoundary; - /** - * 数值上界 - */ - protected Integer exprType ; - /** - * 数值上界 - */ - protected Integer matchMethod ; - /** - * 数值上界 - */ - protected Integer isHexbin ; protected Long compileId; /* (non-Javadoc) * @see com.nis.domain.configuration.BaseCfg#initDefaultValue() @@ -52,9 +47,6 @@ public class NumBoundaryCfg extends BaseCfg { public void initDefaultValue() { // TODO Auto-generated method stub super.initDefaultValue(); - this.exprType = 3; - this.matchMethod = 0; - this.isHexbin = 0; } /** * lowBounadry @@ -84,48 +76,6 @@ public class NumBoundaryCfg extends BaseCfg { public void setUpBoundary(Long upBoundary) { this.upBoundary = upBoundary; } - /** - * exprType - * @return exprType - */ - - public Integer getExprType() { - return exprType; - } - /** - * @param exprType the exprType to set - */ - public void setExprType(Integer exprType) { - this.exprType = exprType; - } - /** - * matchMethod - * @return matchMethod - */ - - public Integer getMatchMethod() { - return matchMethod; - } - /** - * @param matchMethod the matchMethod to set - */ - public void setMatchMethod(Integer matchMethod) { - this.matchMethod = matchMethod; - } - /** - * isHexbin - * @return isHexbin - */ - - public Integer getIsHexbin() { - return isHexbin; - } - /** - * @param isHexbin the isHexbin to set - */ - public void setIsHexbin(Integer isHexbin) { - this.isHexbin = isHexbin; - } /** * compileId * @return compileId diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java new file mode 100644 index 000000000..5a731b75b --- /dev/null +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -0,0 +1,105 @@ +/** + *@Title: MaatCfg.java + *@Package com.nis.domain.maat + *@Description TODO + *@author dell + *@date 2018年3月1日 上午10:29:29 + *@version 版本号 + */ +package com.nis.domain.maat; + +import java.io.Serializable; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.domain.configuration.NumBoundaryCfg; + +/** + * @ClassName: MaatCfg.java + * @Description: TODO + * @author (dell) + * @date 2018年3月1日 上午10:29:29 + * @version V1.0 + */ +public class MaatCfg implements Serializable { + + /** + * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = -7745084076394247318L; + @Expose + @SerializedName("strCfg") + private BaseStringCfg[] strCfg; + @Expose + @SerializedName("ipCfg") + private BaseIpCfg[] ipCfg; + @Expose + @SerializedName("numCfg") + private NumBoundaryCfg[] numCfg; + @Expose + @SerializedName("complexStrCfg") + private ComplexkeywordCfg[] complexStrCfg; + /** + * strCfg + * @return strCfg + */ + + public BaseStringCfg[] getStrCfg() { + return strCfg; + } + /** + * @param strCfg the strCfg to set + */ + public void setStrCfg(BaseStringCfg[] strCfg) { + this.strCfg = strCfg; + } + /** + * ipCfg + * @return ipCfg + */ + + public BaseIpCfg[] getIpCfg() { + return ipCfg; + } + /** + * @param ipCfg the ipCfg to set + */ + public void setIpCfg(BaseIpCfg[] ipCfg) { + this.ipCfg = ipCfg; + } + /** + * numCfg + * @return numCfg + */ + + public NumBoundaryCfg[] getNumCfg() { + return numCfg; + } + /** + * @param numCfg the numCfg to set + */ + public void setNumCfg(NumBoundaryCfg[] numCfg) { + this.numCfg = numCfg; + } + /** + * complexStrCfg + * @return complexStrCfg + */ + + public ComplexkeywordCfg[] getComplexStrCfg() { + return complexStrCfg; + } + /** + * @param complexStrCfg the complexStrCfg to set + */ + public void setComplexStrCfg(ComplexkeywordCfg[] complexStrCfg) { + this.complexStrCfg = complexStrCfg; + } + +} diff --git a/src/main/java/com/nis/domain/maat/ToMaatBean.java b/src/main/java/com/nis/domain/maat/ToMaatBean.java new file mode 100644 index 000000000..8adca69c4 --- /dev/null +++ b/src/main/java/com/nis/domain/maat/ToMaatBean.java @@ -0,0 +1,263 @@ +/** + *@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.ArrayList; +import java.util.List; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import com.nis.domain.configuration.AreaIpCfg; +import com.nis.domain.configuration.IpPortCfg; + +/** + * @ClassName: ToMaatBean.java + * @Description: TODO + * @author (dell) + * @date 2018年2月28日 下午2:03:08 + * @version V1.0 + */ +public class ToMaatBean implements Serializable{ + + /** + * @Fields serialVersionUID:TODO（转换为maat格式的java bean） + * + * @since 1.0.0 + */ + + private static final long serialVersionUID = 5123156423588372849L; + @Expose + @SerializedName("serviceCfg") + private List serviceCfg; + @Expose + @SerializedName("areaCfg") + private List areaCfg; + @Expose + @SerializedName("action") + private Integer action; + @Expose + @SerializedName("areaEffectiveIds") + private String areaEffectiveIds; + @Expose + @SerializedName("attribute") + private String attribute; + @Expose + @SerializedName("classify") + private String classify; + @Expose + @SerializedName("lable") + private String lable; + @Expose + @SerializedName("compileId") + private Long compileId; + @Expose + @SerializedName("isAreaEffective") + private Integer isAreaEffective; + @Expose + @SerializedName("isValid") + private Integer isValid; + @Expose + @SerializedName("requestId") + private Integer requestId; + @Expose + @SerializedName("serviceId") + private Integer serviceId; + + /** + * serviceCfg + * @return serviceCfg + */ + + public List getServiceCfg() { + return serviceCfg; + } + /** + * @param serviceCfg the serviceCfg to set + */ + public void setServiceCfg(List serviceCfg) { + this.serviceCfg = serviceCfg; + } + /** + * areaCfg + * @return areaCfg + */ + + public List getAreaCfg() { + return areaCfg; + } + /** + * @param areaCfg the areaCfg to set + */ + public void setAreaCfg(List areaCfg) { + this.areaCfg = areaCfg; + } + /** + * action + * @return action + */ + + public Integer getAction() { + return action; + } + /** + * @param action the action to set + */ + public void setAction(Integer action) { + this.action = action; + } + /** + * areaEffectiveIds + * @return areaEffectiveIds + */ + + public String getAreaEffectiveIds() { + return areaEffectiveIds; + } + /** + * @param areaEffectiveIds the areaEffectiveIds to set + */ + public void setAreaEffectiveIds(String areaEffectiveIds) { + this.areaEffectiveIds = areaEffectiveIds; + } + /** + * attribute + * @return attribute + */ + + public String getAttribute() { + return attribute; + } + /** + * @param attribute the attribute to set + */ + public void setAttribute(String attribute) { + this.attribute = attribute; + } + /** + * classify + * @return classify + */ + + public String getClassify() { + return classify; + } + /** + * @param classify the classify to set + */ + public void setClassify(String classify) { + this.classify = classify; + } + + /** + * lable + * @return lable + */ + + public String getLable() { + return lable; + } + /** + * @param lable the lable to set + */ + public void setLable(String lable) { + this.lable = lable; + } + /** + * compileId + * @return compileId + */ + + public Long getCompileId() { + return compileId; + } + /** + * @param compileId the compileId to set + */ + public void setCompileId(Long compileId) { + this.compileId = compileId; + } + /** + * isAreaEffective + * @return isAreaEffective + */ + + public Integer getIsAreaEffective() { + return isAreaEffective; + } + /** + * @param isAreaEffective the isAreaEffective to set + */ + public void setIsAreaEffective(Integer isAreaEffective) { + this.isAreaEffective = isAreaEffective; + } + /** + * isValid + * @return isValid + */ + + public Integer getIsValid() { + return isValid; + } + /** + * @param isValid the isValid to set + */ + public void setIsValid(Integer isValid) { + this.isValid = isValid; + } + /** + * requestId + * @return requestId + */ + + public Integer getRequestId() { + return requestId; + } + /** + * @param requestId the requestId to set + */ + public void setRequestId(Integer requestId) { + this.requestId = requestId; + } + /** + * serviceId + * @return serviceId + */ + + public Integer getServiceId() { + return serviceId; + } + /** + * @param serviceId the serviceId to set + */ + public void setServiceId(Integer serviceId) { + 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 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)); + + } +} diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 4006a65c0..1ebdd3b7b 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -2,6 +2,8 @@ package com.nis.util; import java.util.Date; +import com.google.gson.GsonBuilder; + public final class Constants { public static final String DEFAULT_CAPTCHA_PARAM = "captcha"; @@ -222,5 +224,5 @@ public final class Constants { * 数据中心B版数据库名称,程序中每次查询时使用的数据库名称 use HIVEBDBNAME */ public static final String HIVEBDBNAME = Configurations.getStringProperty("jdbc.hive.BName", "xa_z2_mesalog_hive"); - + public static final GsonBuilder gsonbuilder=new GsonBuilder(); } diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java index 57133d029..e88634671 100644 --- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java @@ -57,11 +57,11 @@ public class ComplexStringCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java index f3c399778..948960738 100644 --- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import com.nis.domain.Page; import com.nis.domain.ServiceConfigInfo; -import com.nis.domain.configuration.BaseCfg; import com.nis.domain.configuration.BaseIpCfg; import com.nis.domain.configuration.RequestInfo; import com.nis.domain.configuration.ServiceDictInfo; @@ -68,11 +67,11 @@ public class IpCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ @@ -109,6 +108,7 @@ public class IpCfgController extends BaseController{ ipcfg.setAction(action); ipcfg.setServiceId(serviceId); model.addAttribute("_cfg", ipcfg); + long compileId=this.getCompileId(); model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); @@ -201,7 +201,7 @@ public class IpCfgController extends BaseController{ addMessage(model,"保存失败！"); }else if(!StringUtils.isBlank(ipCfg.getTableName())){ int serviceId=ipCfg.getServiceId(); - long compileId=getCompileId(ipCfg); + long compileId=getCompileId(); ipCfg.setIsValid(Constants.VALID_NO); ipCfg.setIsAudit(Constants.AUDIT_NOT_YET); ipCfg.setCompileId(compileId); @@ -225,7 +225,7 @@ public class IpCfgController extends BaseController{ if(serviceConfigInfo!=null){ String tableName=serviceConfigInfo.getTableName(); if(!StringUtils.isBlank(tableName)){ - long compileId=getCompileId(ipCfg); + long compileId=getCompileId(); ipCfg.setTableName(tableName); ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); ipCfg.setCreateTime(new Date()); @@ -235,7 +235,6 @@ public class IpCfgController extends BaseController{ if(ipCfg.getCfgId()==null){ ipCfg.setCreatorId(ipCfg.getCurrentUser().getId()); ipCfg.setCreateTime(new Date()); - ipCfgService.addIpCfg(ipCfg); }else{ ipCfg.setEditorId(ipCfg.getCurrentUser().getId()); ipCfg.setEditTime(new Date()); @@ -379,7 +378,7 @@ public class IpCfgController extends BaseController{ * @exception * @since 1.0.0 */ - protected long getCompileId(BaseCfg cfg){ + protected long getCompileId(){ return 0; } } diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java index a8bba132b..59fc12b10 100644 --- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java @@ -52,11 +52,11 @@ public class NumCfgController extends BaseController{ model.addAttribute("action", cfg.getAction()); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); }else{ logger.error("未获取到正确的serviceId"); diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java index 33ad236ec..5cba63859 100644 --- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java @@ -57,11 +57,11 @@ public class StringCfgController extends BaseController{ model.addAttribute("tableName", tableName); List requestInfos=requestInfoService.getValidRequestInfo(); model.addAttribute("requestInfos", requestInfos); - List fls=serviceDictInfoService.findFlDict(); + List fls=serviceDictInfoService.findAllFlDict(); model.addAttribute("fls", fls); - List xzs=serviceDictInfoService.findXzDict(); + List xzs=serviceDictInfoService.findAllXzDict(); model.addAttribute("xzs", xzs); - List lables=serviceDictInfoService.findLableDict(); + List lables=serviceDictInfoService.findAllLableDict(); model.addAttribute("lables", lables); } }else{ diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml index 8a0811a3d..ebba82df0 100644 --- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml @@ -159,8 +159,7 @@ --> , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,sdic.item_value as classifyName,sdia.item_value as attributeName - ,sdil.item_value as lableName + ,ri.request_title as requestName from ${tableName} r left join sys_user s on r.creator_id=s.id diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml index 23229f419..9985f2618 100644 --- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml @@ -239,8 +239,7 @@ --> , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,sdic.item_value as classifyName,sdia.item_value as attributeName - ,sdil.item_value as lableName + ,ri.request_title as requestName from ${tableName} r left join sys_user s on r.creator_id=s.id diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml index efa6919be..5795c36d3 100644 --- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml @@ -162,8 +162,7 @@ --> , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,sdic.item_value as classifyName,sdia.item_value as attributeName - ,sdil.item_value as lableName + ,ri.request_title as requestName from num_boundary_cfg r left join sys_user s on r.creator_id=s.id diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml index 23c70259a..2e20d46fd 100644 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml @@ -34,7 +34,15 @@ - + + + + + + + + + s.service_dict_id AS serviceDictId, s.item_type AS itemType, @@ -49,6 +57,15 @@ s.editor_id AS "serviceDictEditor.id", s.edit_time AS editTime + + s.service_dict_id AS serviceDictId, + s.item_type AS itemType, + s.item_code AS itemCode, + s.item_value AS itemValue, + s.item_desc AS itemDesc, + s.is_leaf AS isLeaf, + s.is_valid AS isValid + @@ -262,14 +279,14 @@ UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId} - select - + from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid}; - select - + from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType}; diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index 1d012d1be..6f681d522 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -178,8 +178,7 @@ --> , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,sdic.item_value as classifyName,sdia.item_value as attributeName - ,sdil.item_value as lableName + ,ri.request_title as requestName from ${tableName} r left join sys_user s on r.creator_id=s.id diff --git a/src/main/java/com/nis/web/service/CrudService.java b/src/main/java/com/nis/web/service/CrudService.java index c91f75056..caaae695d 100644 --- a/src/main/java/com/nis/web/service/CrudService.java +++ b/src/main/java/com/nis/web/service/CrudService.java @@ -3,6 +3,7 @@ */ package com.nis.web.service; +import java.util.ArrayList; import java.util.List; import org.apache.ibatis.session.ExecutorType; @@ -10,8 +11,17 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.factory.annotation.Autowired; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.nis.domain.BaseEntity; import com.nis.domain.Page; +import com.nis.domain.configuration.AreaIpCfg; +import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.BaseIpCfg; +import com.nis.domain.configuration.BaseStringCfg; +import com.nis.domain.configuration.ComplexkeywordCfg; +import com.nis.domain.maat.MaatCfg; +import com.nis.domain.maat.ToMaatBean; import com.nis.web.dao.CrudDao; /** @@ -174,5 +184,82 @@ public abstract class CrudService, T extends BaseEntity> } } } - + /** + * + * sendToMaatConvertor(转换配置为Maat格式) + * (所有的配置需拥有一样的编译ID，action,serviceId,等属性) + * @param cfg + * @return + *boolean + * @exception + * @since 1.0.0 + */ + public boolean sendToMaatConvertor(AreaIpCfg[] areaCfg,T ... cfg){ + if(cfg==null){ + throw new RuntimeException("转换出错,配置为空"); + } + long compileId=0l; + ToMaatBean toMaatBean=new ToMaatBean(); + MaatCfg maatCfg=new MaatCfg(); + if(cfg[0] instanceof BaseIpCfg){ + maatCfg.setIpCfg((BaseIpCfg[])cfg); + compileId=((BaseIpCfg)cfg[0]).getCompileId(); + }else if(cfg[0] instanceof BaseStringCfg){ + maatCfg.setStrCfg((BaseStringCfg[])cfg); + compileId=((BaseStringCfg)cfg[0]).getCompileId(); + }else if(cfg[0] instanceof ComplexkeywordCfg){ + maatCfg.setComplexStrCfg((ComplexkeywordCfg[])cfg); + compileId=((ComplexkeywordCfg)cfg[0]).getCompileId(); + } + if(areaCfg!=null){ + AreaIpCfg[] cfgArray=new AreaIpCfg[1]; + + } + List serviceCfg=new ArrayList<>(); + serviceCfg.add(maatCfg); + BaseCfg baseCfg=(BaseCfg)cfg[0]; + if(compileId==0l){ + throw new RuntimeException("转换出错,未获取到正确的compileId"); + }else{ + toMaatBean.setCompileId(compileId); + } + if(baseCfg.getAction()==null){ + throw new RuntimeException("转换出错,未获取到正确的action"); + }else{ + toMaatBean.setAction(baseCfg.getAction()); + } + if(baseCfg.getIsAreaEffective()==null){ + throw new RuntimeException("转换出错,未获取到正确的isAreaEffective"); + }else{ + toMaatBean.setIsAreaEffective(baseCfg.getIsAreaEffective()); + } + if(baseCfg.getIsValid()==null){ + throw new RuntimeException("转换出错,未获取到正确的isValid"); + }else{ + toMaatBean.setIsValid(baseCfg.getIsValid()); + } + if(baseCfg.getRequestId()==null){ + throw new RuntimeException("转换出错,未获取到正确的requestId"); + }else{ + toMaatBean.setRequestId(baseCfg.getRequestId()); + } + if(baseCfg.getServiceId()==null){ + throw new RuntimeException("转换出错,未获取到正确的serviceId"); + }else{ + toMaatBean.setServiceId(baseCfg.getServiceId()); + } + toMaatBean.setAreaEffectiveIds(baseCfg.getAreaEffectiveIds()==null?"":baseCfg.getAreaEffectiveIds()); + toMaatBean.setAttribute(baseCfg.getAttribute()==null?"":baseCfg.getAttribute()); + toMaatBean.setClassify(baseCfg.getClassify()==null?"":baseCfg.getClassify()); + toMaatBean.setLable(baseCfg.getLable()==null?"":baseCfg.getLable()); + Gson gson=new GsonBuilder().disableHtmlEscaping() + .setDateFormat("yyyy-MM-dd HH:mm:ss") + /*.setPrettyPrinting().serializeNulls()*/ + .excludeFieldsWithoutExposeAnnotation() + .create(); + String json=gson.toJson(toMaatBean); + //发送至maat,待完成 + + return false; + } } diff --git a/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java b/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java index b9af64270..586292213 100644 --- a/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/ComplexStringCfgService.java @@ -2,7 +2,6 @@ package com.nis.web.service.configuration; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,7 +28,7 @@ public class ComplexStringCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int addIpCfg(BaseIpCfg baseIpCfg){ if(!StringUtils.isBlank(baseIpCfg.getTableName())){ return ipCfgDao.insert(baseIpCfg); @@ -53,7 +53,7 @@ public class IpCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int updateIpCfg(BaseIpCfg baseIpCfg){ if(!StringUtils.isBlank(baseIpCfg.getTableName())){ return ipCfgDao.updateByPrimaryKeySelective(baseIpCfg); @@ -77,7 +77,7 @@ public class IpCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int auditIpCfg(BaseIpCfg baseIpCfg){ if(!StringUtils.isBlank(baseIpCfg.getTableName())){ return ipCfgDao.audit(baseIpCfg); @@ -101,7 +101,7 @@ public class IpCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int deleteIpCfg(BaseIpCfg baseIpCfg){ if(!StringUtils.isBlank(baseIpCfg.getTableName())){ return ipCfgDao.updateValid(baseIpCfg); diff --git a/src/main/java/com/nis/web/service/configuration/NumCfgService.java b/src/main/java/com/nis/web/service/configuration/NumCfgService.java index 5187b1209..fbbffc5ca 100644 --- a/src/main/java/com/nis/web/service/configuration/NumCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/NumCfgService.java @@ -1,7 +1,6 @@ package com.nis.web.service.configuration; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +27,7 @@ public class NumCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int addNumCfg(NumBoundaryCfg cfg){ return numCfgDao.insert(cfg); } @@ -42,7 +41,7 @@ public class NumCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int updateNumCfg(NumBoundaryCfg cfg){ return numCfgDao.updateByPrimaryKeySelective(cfg); } @@ -56,7 +55,7 @@ public class NumCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int auditNumCfg(NumBoundaryCfg cfg){ return numCfgDao.audit(cfg); } @@ -70,7 +69,7 @@ public class NumCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int deleteNumCfg(NumBoundaryCfg cfg){ return numCfgDao.updateValid(cfg); } diff --git a/src/main/java/com/nis/web/service/configuration/StringCfgService.java b/src/main/java/com/nis/web/service/configuration/StringCfgService.java index 368b1200f..84b1470d1 100644 --- a/src/main/java/com/nis/web/service/configuration/StringCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/StringCfgService.java @@ -29,7 +29,7 @@ public class StringCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int addStringCfg(BaseStringCfg baseStringCfg){ if(!StringUtils.isBlank(baseStringCfg.getTableName())){ return stringCfgDao.insert(baseStringCfg); @@ -53,7 +53,7 @@ public class StringCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int updateStringCfg(BaseStringCfg baseStringCfg){ if(!StringUtils.isBlank(baseStringCfg.getTableName())){ return stringCfgDao.updateByPrimaryKeySelective(baseStringCfg); @@ -77,7 +77,7 @@ public class StringCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int auditStringCfg(BaseStringCfg baseStringCfg){ if(!StringUtils.isBlank(baseStringCfg.getTableName())){ return stringCfgDao.audit(baseStringCfg); @@ -101,7 +101,7 @@ public class StringCfgService extends CrudService { * @exception * @since 1.0.0 */ - @Transactional(readOnly=false,rollbackFor=DataAccessException.class) + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public int deleteStringCfg(BaseStringCfg baseStringCfg){ if(!StringUtils.isBlank(baseStringCfg.getTableName())){ return stringCfgDao.updateValid(baseStringCfg); diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 547b825e3..73b15b9dd 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -24,10 +24,25 @@
@@ -43,10 +58,19 @@
@@ -58,11 +82,21 @@
diff --git a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp index f2ce0facb..315838877 100644 --- a/src/main/webapp/WEB-INF/include/form/ipInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/ipInfo.jsp @@ -122,7 +122,7 @@ -
+<%--
@@ -143,34 +143,7 @@ - <%-- --%> -
-
-
-
-<%--
-
-
- -
- -
-
-
-
-
- -
- - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index bf7b8f752..eee7dcd4f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -23,8 +23,6 @@ $(function(){

- 新增 - 修改

@@ -32,9 +30,9 @@ $(function(){
- - 新增 - 修改 + + +
来函 - 编译id + 是否区域管控 分类 性质 标签 - 区域生效id + 有效标识 是否审核 创建人员 @@ -127,17 +127,38 @@ 封堵监测白名单 灰名单 - ${cfg.serviceId } + <%-- ${cfg.serviceId } --%> ${cfg.requestName } - ${cfg.compileId } + <%-- ${cfg.compileId } --%> 否 是 - ${cfg.classifyName } - ${cfg.attributeName } - ${cfg.lableName } - ${cfg.areaEffectiveIds } + + + + + ${fl.itemValue}, + + + + ${classifyName[status]} + + + + + ${xz.itemValue}, + + + + + + + ${lable.itemValue}, + + + + <%-- ${cfg.areaEffectiveIds } --%> 否 是 @@ -172,7 +193,7 @@
    • -
    • +
    • diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp index 115fdc765..88da2f167 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp @@ -70,8 +70,6 @@ $(function(){

    - 新增 - 修改

    @@ -79,9 +77,9 @@ $(function(){
    - - 新增 - 修改 + + +
    管控类型 - 业务id + 来函 - 编译id + 是否区域管控 分类 性质 标签 - 区域生效id + 有效标识 是否审核 创建人员 @@ -123,9 +123,9 @@ - - - ${ipCfg.cfgId } + + + ${status.index+1 } ${ipCfg.cfgDesc } V${ipCfg.ipType } ${ipCfg.srcIp } @@ -138,7 +138,7 @@ ${ipCfg.dstPortMask } ${ipCfg.direction } ${ipCfg.protocol } - ${ipCfg.protocolId } + <%-- ${ipCfg.protocolId } --%> 阻断 监测 @@ -147,17 +147,38 @@ 封堵监测白名单 灰名单 - ${ipCfg.serviceId } + <%-- ${ipCfg.serviceId } --%> ${ipCfg.requestName } - ${ipCfg.compileId } + <%-- ${ipCfg.compileId } --%> 否 是 - ${ipCfg.classifyName } - ${ipCfg.attributeName } - ${ipCfg.lableName } - ${ipCfg.areaEffectiveIds } + + + + + ${fl.itemValue}, + + + + ${classifyName[status]} + + + + + ${xz.itemValue}, + + + + + + + ${lable.itemValue}, + + + + <%-- ${ipCfg.areaEffectiveIds } --%> 否 是 @@ -192,7 +213,7 @@
    • -
    • +
    • diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp index 58ba481d8..563688564 100644 --- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp @@ -23,8 +23,6 @@ $(function(){

    - 新增 - 修改

    @@ -32,9 +30,9 @@ $(function(){
    - - 新增 - 修改 + + +
    来函 - 编译id + 是否区域管控 分类 性质 标签 - 区域生效id + 有效标识 是否审核 创建人员 @@ -112,9 +112,9 @@ - + - ${cfg.cfgId } + ${status.index+1 } ${cfg.cfgDesc } ${cfg.cfgKeywords } @@ -125,17 +125,38 @@ 封堵监测白名单 灰名单 - ${cfg.serviceId } + <%-- ${cfg.serviceId } --%> ${cfg.requestName } - ${cfg.compileId } + <%-- ${cfg.compileId } --%> 否 是 - ${cfg.classifyName } - ${cfg.attributeName } - ${cfg.lableName } - ${cfg.areaEffectiveIds } + + + + + ${fl.itemValue}, + + + + ${classifyName[status]} + + + + + ${xz.itemValue}, + + + + + + + ${lable.itemValue}, + + + + <%-- ${cfg.areaEffectiveIds } --%> 否 是 @@ -170,7 +191,7 @@
    • -
    • +