(1)ip,字符串,增强字符串mapper.xml里的get方法删除多余参数,只保留cfgId以及compileId。

(2)系统字典表更新方法查询多域增强字符串配置的匹配区域。mysql这里查询好像自动大小写忽略,待测试。
(3)多域界面提交。界面展示采用查一张主表再查其他表的方式展示,非所有表都有的字段只能查主表的,这里界面查询条件已做限制;另外表单提交未做验证;多个同类型(字符串,增强字符串)的表现在界面无法区分,后面会将界面展示意义不明的字段调整展示名称。
This commit is contained in:
wangxin
2018-03-29 14:56:27 +08:00
parent c0e0dd3b7a
commit 3d5f9d6878
21 changed files with 1894 additions and 448 deletions

View File

@@ -22,6 +22,7 @@ import com.nis.domain.BaseEntity;
* @version V1.0
*/
public class BaseCfg<T> extends BaseEntity<T> {
protected String showName;//表在界面上展示的名称
protected String seltype;//选中类型,页面搜索用
protected String tableName;
/**
@@ -663,5 +664,4 @@ public class BaseCfg<T> extends BaseEntity<T> {
public void setCompileId(Integer compileId) {
this.compileId = compileId;
}
}

View File

@@ -24,7 +24,6 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
*
* @since 1.0.0
*/
private static final long serialVersionUID = -1939538118388300002L;
/**
* ip类型

View File

@@ -33,6 +33,7 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
@Expose
@SerializedName("keywords")
protected String cfgKeywords;
protected String cfgKeywordsShowName;
/**
* cfgKeywords
* @return cfgKeywords
@@ -116,5 +117,19 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
super.initDefaultValue();
this.isHexbin = 0;
}
/**
* cfgKeywordsShowName
* @return cfgKeywordsShowName
*/
public String getCfgKeywordsShowName() {
return cfgKeywordsShowName;
}
/**
* @param cfgKeywordsShowName the cfgKeywordsShowName to set
*/
public void setCfgKeywordsShowName(String cfgKeywordsShowName) {
this.cfgKeywordsShowName = cfgKeywordsShowName;
}
}

View File

@@ -8,6 +8,8 @@
*/
package com.nis.domain.configuration;
import org.apache.commons.lang3.StringUtils;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

View File

@@ -0,0 +1,104 @@
/**
*@Title: ToMaatResult.java
*@Package com.nis.domain.maat
*@Description TODO
*@author dell
*@date 2018年3月27日 下午5:10:01
*@version 版本号
*/
package com.nis.domain.maat;
import java.io.Serializable;
/**
* @ClassName: ToMaatResult.java
* @Description: TODO
* @author (dell)
* @date 2018年3月27日 下午5:10:01
* @version V1.0
*/
public class ToMaatResult implements Serializable{
/**
* @Fields serialVersionUID:TODO用一句话描述这个变量表示什么
*
* @since 1.0.0
*/
private static final long serialVersionUID = 4244178887886507606L;
private Integer status;
private Integer businessCode;
private String reason;
private String msg;
private String fromuri;
/**
* status
* @return status
*/
public Integer getStatus() {
return status;
}
/**
* @param status the status to set
*/
public void setStatus(Integer status) {
this.status = status;
}
/**
* businessCode
* @return businessCode
*/
public Integer getBusinessCode() {
return businessCode;
}
/**
* @param businessCode the businessCode to set
*/
public void setBusinessCode(Integer businessCode) {
this.businessCode = businessCode;
}
/**
* reason
* @return reason
*/
public String getReason() {
return reason;
}
/**
* @param reason the reason to set
*/
public void setReason(String reason) {
this.reason = reason;
}
/**
* msg
* @return msg
*/
public String getMsg() {
return msg;
}
/**
* @param msg the msg to set
*/
public void setMsg(String msg) {
this.msg = msg;
}
/**
* fromuri
* @return fromuri
*/
public String getFromuri() {
return fromuri;
}
/**
* @param fromuri the fromuri to set
*/
public void setFromuri(String fromuri) {
this.fromuri = fromuri;
}
}