(1)avCfgService暂时继承BaseService

(2)BaseCfg字段调整,加入functionId字段,去掉maatTable字段
(3)删除SystemService相关代码
(4)字符串,增强字符串配置加入字段cfgType
(5)邮件,ssl,Ftp pojo调整,删除多余的,新增keywordCfg
(6)spring-mvc.xml注释redisDao
This commit is contained in:
wangxin
2018-05-17 19:08:37 +08:00
parent c3948a865f
commit 91ad42c562
36 changed files with 273 additions and 1166 deletions

View File

@@ -11,8 +11,6 @@ package com.nis.domain.configuration;
import java.util.Date;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.domain.BaseEntity;
/**
@@ -33,9 +31,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* 编译id
*/
protected Integer compileId ;
@Expose
@SerializedName("maatTable")
protected String maatTable;
/**
* @Fields serialVersionUID:TODO用一句话描述这个变量表示什么
*
@@ -112,10 +107,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* 来函
*/
protected String requestName;
/**
* 编译id
*/
// protected Integer compileId;
/**
* 是否区域gk
*/
@@ -144,9 +135,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
* 标签
*/
protected String lableName;
// protected Integer exprType =0;
// protected Integer matchMethod =0;
// protected Integer isHexbin =0;
/**
* 区域生效id
*/
@@ -160,6 +148,22 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
protected Date search_edit_time_end;
protected Date search_audit_time_start;
protected Date search_audit_time_end;
protected Integer functionId;
/**
* functionId
* @return functionId
*/
public Integer getFunctionId() {
return functionId;
}
/**
* @param functionId the functionId to set
*/
public void setFunctionId(Integer functionId) {
this.functionId = functionId;
}
/**
* cfgId
* @return cfgId
@@ -542,20 +546,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
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;
}
/**
* search_create_time_start
* @return search_create_time_start