融合代码，提交本地

更新：辅助字典移动到basics目录下，
               修订数据类型条件查询无效bug，
               优化无条件分页查询代码，
               配置编码自增，用户不需手动输入（app强特征作用域功能待添加）；
               无上级，改为根节点，

pom.xml

@@ -638,8 +638,16 @@
 			<artifactId>cglib</artifactId>
 			<version>3.1</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.code.gson</groupId>
+					<artifactId>gson-parent</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
-
-
 </project>

src/main/java/com/nis/domain/SysRole.java

@@ -45,7 +45,11 @@ public class SysRole extends BaseEntity<SysRole>{
 
     private Date createTime;
     
- // 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；8：所在部门及以下数据；9：所在部门数据）
+ /**
+  *  数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；
+  *  6：所在部门及以下数据；7：所在部门数据,8:配置员，9：审核员，10：审计员）
+  */
+    
  	public static final Integer DATA_SCOPE_ALL = 1;
  	public static final Integer DATA_SCOPE_COMPANY_AND_CHILD = 2;
  	public static final Integer DATA_SCOPE_COMPANY = 3;
@@ -53,6 +57,9 @@ public class SysRole extends BaseEntity<SysRole>{
  	public static final Integer DATA_SCOPE_OFFICE = 5;
  	public static final Integer DATA_SCOPE_ENTITY_AND_CHILD = 6;
  	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;
 
 
 

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

@@ -24,6 +24,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()
 	 */

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<T> extends BaseEntity<T> {
 	protected String tableName;
+	@Expose
+	@SerializedName("maatTable")
+	protected String maatTable;
 	/**
 	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
 	 *
@@ -519,5 +524,19 @@ public class BaseCfg<T> extends BaseEntity<T> {
 	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;
+	}
 	
 }

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<BaseIpCfg> {
 	/**
 	 * 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

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<BaseStringCfg> {
 	/**
 	 * 配置关键字
 	 */
+	@Expose
+	@SerializedName("keywords")
 	protected String cfgKeywords;
 	/**
 	 * cfgKeywords
@@ -49,14 +54,20 @@ public class BaseStringCfg extends BaseCfg<BaseStringCfg> {
 	/**
 	 * 表达式类型
 	 */
+	@Expose
+	@SerializedName("exprType")
 	protected Integer exprType ;
 	/**
 	 * 匹配方式
 	 */
+	@Expose
+	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
 	/**
 	 * 是否hex二进制
 	 */
+	@Expose
+	@SerializedName("isHexbin")
 	protected Integer isHexbin;
 	
 	/**

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<ComplexkeywordCfg>{
 	/**
 	 * 匹配区域
 	 */
+	@Expose
+	@SerializedName("district")
 	protected String district ;
 	/**
 	 * 关键字
 	 */
+	@Expose
+	@SerializedName("keywords")
 	protected String keywords;
 	/**
 	 * 编译id
@@ -39,14 +46,20 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 	/**
 	 * 表达式类型
 	 */
+	@Expose
+	@SerializedName("exprType")
 	protected Integer exprType ;
 	/**
 	 * 匹配方式
 	 */
+	@Expose
+	@SerializedName("matchMethod")
 	protected Integer matchMethod ;
 	/**
 	 * 是否hex二进制
 	 */
+	@Expose
+	@SerializedName("isHexbin")
 	protected Integer isHexbin ;
 	/**
 	 * district

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);
+	}
 	
 }

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<NumBoundaryCfg> {
 	/**
 	 * 数值下界
 	 */
+	@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<NumBoundaryCfg> {
 	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<NumBoundaryCfg> {
 	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

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

@@ -1,11 +1,14 @@
 package com.nis.domain.configuration;
 
 import java.util.Date;
+import java.util.List;
 
 import com.nis.domain.BaseEntity;
 
 public class RequestInfo extends BaseEntity<RequestInfo>{
 	
+	private Long taskId;
+	
     private String requestNumber;
 
     private String requestOrg;
@@ -39,8 +42,18 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
     private Date beginDate;//开始时间
     private Date endDate;//结束时间
     private String timeType;//时间类型
+    private String taskName;//专项任务
     
-    public String getRequestNumber() {
+
+	public Long getTaskId() {
+		return taskId;
+	}
+
+	public void setTaskId(Long taskId) {
+		this.taskId = taskId;
+	}
+
+	public String getRequestNumber() {
         return requestNumber;
     }
 
@@ -192,4 +205,12 @@ public class RequestInfo extends BaseEntity<RequestInfo>{
 		this.timeType = timeType;
 	}
 
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+    
 }

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

@@ -0,0 +1,131 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.domain.BaseEntity;
+
+public class TaskInfo extends BaseEntity<TaskInfo> {
+	private static final long serialVersionUID = 1L;
+
+	private String taskName;
+
+	private String taskOrg;
+
+	private Date taskTime;
+
+	private String taskDesc;
+
+	private Integer isValid;
+
+	private Integer isAudit;
+
+	private Integer creatorId;
+
+	private Date createTime;
+
+	private Integer editorId;
+
+	private Date editTime;
+
+	private Integer auditorId;
+
+	private Date auditTime;
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getTaskOrg() {
+		return taskOrg;
+	}
+
+	public void setTaskOrg(String taskOrg) {
+		this.taskOrg = taskOrg;
+	}
+
+	public Date getTaskTime() {
+		return taskTime;
+	}
+
+	public void setTaskTime(Date taskTime) {
+		this.taskTime = taskTime;
+	}
+
+	public String getTaskDesc() {
+		return taskDesc;
+	}
+
+	public void setTaskDesc(String taskDesc) {
+		this.taskDesc = taskDesc;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Integer getEditorId() {
+		return editorId;
+	}
+
+	public void setEditorId(Integer editorId) {
+		this.editorId = editorId;
+	}
+
+	public Date getEditTime() {
+		return editTime;
+	}
+
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+
+	public Integer getAuditorId() {
+		return auditorId;
+	}
+
+	public void setAuditorId(Integer auditorId) {
+		this.auditorId = auditorId;
+	}
+
+	public Date getAuditTime() {
+		return auditTime;
+	}
+
+	public void setAuditTime(Date auditTime) {
+		this.auditTime = auditTime;
+	}
+
+	
+}

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;
+	}
+	
+}

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<MaatCfg[]> serviceCfg;
+	@Expose
+	@SerializedName("areaCfg")
+	private List<AreaIpCfg> 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<MaatCfg[]> getServiceCfg() {
+		return serviceCfg;
+	}
+	/**
+	 * @param serviceCfg the serviceCfg to set
+	 */
+	public void setServiceCfg(List<MaatCfg[]> serviceCfg) {
+		this.serviceCfg = serviceCfg;
+	}
+	/**
+	 * areaCfg
+	 * @return  areaCfg
+	*/
+	
+	public List<AreaIpCfg> getAreaCfg() {
+		return areaCfg;
+	}
+	/**
+	 * @param areaCfg the areaCfg to set
+	 */
+	public void setAreaCfg(List<AreaIpCfg> 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<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));
+		
+	}
+}

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();
 }

src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java

@@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/configuration/IpCfgController.java

@@ -378,7 +378,7 @@ public class IpCfgController extends BaseController{
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	protected long getCompileId(BaseCfg cfg){
+	protected long getCompileId(){
 		return 0;
 	}
 }

src/main/java/com/nis/web/controller/configuration/NumCfgController.java

@@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -1,5 +1,7 @@
 package com.nis.web.controller.configuration;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -12,15 +14,10 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.util.Constants;
+import com.nis.domain.configuration.TaskInfo;
-import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.configuration.RequestInfoService;
 
-/**
- * 测试类
- *
- */
 @Controller
 @RequestMapping("${adminPath}/cfg/request")
 public class RequestInfoController extends BaseController{
@@ -43,11 +40,15 @@ public class RequestInfoController extends BaseController{
 	 */
 	@RequestMapping(value={"form"})
 	public String form(RequestInfo requestInfo, Model model) {
+		TaskInfo taskInfo = new TaskInfo();
+		taskInfo.setId(requestInfo.getTaskId());
+		showTask(taskInfo,model);
 		if(requestInfo.getId()!=null){
 			requestInfo = requestInfoService.getRequestInfoById(requestInfo.getId());
 			model.addAttribute("requestInfo", requestInfo);
+		}else{
+			model.addAttribute("requestInfo", requestInfo);
 		}
-		model.addAttribute("requestInfo", requestInfo);
 		return "/cfg/requestForm";
 	}
 
@@ -133,4 +134,13 @@ public class RequestInfoController extends BaseController{
 		
 	}
 
+	/**
+	 * 查询专项任务
+	 * @param taskInfo
+	 * @param model
+	 */
+	public void showTask(TaskInfo taskInfo ,Model model){
+		List<TaskInfo> taskInfos = requestInfoService.showTask(taskInfo);
+		model.addAttribute("taskInfos", taskInfos);
+	}
 }

src/main/java/com/nis/web/controller/configuration/StringCfgController.java

@@ -14,10 +14,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 

src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml

@@ -159,8 +159,7 @@
 		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, 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
+			,ri.request_title as requestName
-			,sdil.item_value as lableName
 		</trim>
 		from ${tableName} r 
 		left join sys_user s on r.creator_id=s.id

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -239,8 +239,7 @@
 		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, 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
+			,ri.request_title as requestName
-			,sdil.item_value as lableName
 		</trim>
 		from ${tableName} r 
 		left join sys_user s on r.creator_id=s.id

src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml

@@ -162,8 +162,7 @@
 		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, 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
+			,ri.request_title as requestName
-			,sdil.item_value as lableName
 		</trim>
 		from num_boundary_cfg r 
 		left join sys_user s on r.creator_id=s.id

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -20,14 +21,8 @@ public interface RequestInfoDao  extends CrudDao {
 	
     int deleteByPrimaryKey(Long id);
 
+	List<TaskInfo> showTask(TaskInfo taskInfo);
 
-    int insertSelective(RequestInfo requestInfo);
-
-    RequestInfo selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(RequestInfo requestInfo);
-
-    int updateByPrimaryKey(RequestInfo requestInfo);
 
 
 }

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -16,6 +16,7 @@
     <result column="edit_time" jdbcType="DATE" property="editTime" />
     <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
     <result column="audit_time" jdbcType="DATE" property="auditTime" />
+    <result column="task_id" jdbcType="BIGINT" property="taskId" />
   </resultMap>
   <sql id="Base_Column_List">
     id, request_number, request_org, request_time, request_title, request_content, is_valid, 
@@ -25,6 +26,7 @@
   <select id="findRequestInfo" resultMap="BaseResultMap">
 	select
 		r.id AS id,
+		r.task_id AS taskId,
 		r.request_number AS requestNumber,
 		r.request_org AS requestOrg,
 		r.request_time AS requestTime,
@@ -37,11 +39,13 @@
 		u.name AS editorName,
 		r.edit_time AS editTime,
 		e.name AS currentName,
-		r.audit_time AS auditTime
+		r.audit_time AS auditTime,
+		t.task_name AS taskName
 	from request_info r
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
+	left join task_info t on r.task_id=t.id
 	where r.is_valid=1 and r.is_audit !=3
 	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
@@ -159,159 +163,4 @@
     where id = #{id,jdbcType=BIGINT} and is_audit !=1
   </update>
   
-  
-  
-  <insert id="insertSelective" parameterType="com.nis.domain.configuration.RequestInfo">
-    insert into request_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="requestNumber != null">
-        request_number,
-      </if>
-      <if test="requestOrg != null">
-        request_org,
-      </if>
-      <if test="requestTime != null">
-        request_time,
-      </if>
-      <if test="requestTitle != null">
-        request_title,
-      </if>
-      <if test="requestContent != null">
-        request_content,
-      </if>
-      <if test="isValid != null">
-        is_valid,
-      </if>
-      <if test="isAudit != null">
-        is_audit,
-      </if>
-      <if test="creatorId != null">
-        creator_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="editorId != null">
-        editor_id,
-      </if>
-      <if test="editTime != null">
-        edit_time,
-      </if>
-      <if test="auditorId != null">
-        auditor_id,
-      </if>
-      <if test="auditTime != null">
-        audit_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="requestNumber != null">
-        #{requestNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="requestOrg != null">
-        #{requestOrg,jdbcType=VARCHAR},
-      </if>
-      <if test="requestTime != null">
-        #{requestTime,jdbcType=DATE},
-      </if>
-      <if test="requestTitle != null">
-        #{requestTitle,jdbcType=VARCHAR},
-      </if>
-      <if test="requestContent != null">
-        #{requestContent,jdbcType=VARCHAR},
-      </if>
-      <if test="isValid != null">
-        #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null">
-        #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="creatorId != null">
-        #{creatorId,jdbcType=INTEGER},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=DATE},
-      </if>
-      <if test="editorId != null">
-        #{editorId,jdbcType=INTEGER},
-      </if>
-      <if test="editTime != null">
-        #{editTime,jdbcType=DATE},
-      </if>
-      <if test="auditorId != null">
-        #{auditorId,jdbcType=INTEGER},
-      </if>
-      <if test="auditTime != null">
-        #{auditTime,jdbcType=DATE},
-      </if>
-    </trim>
-  </insert>
- 
-  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.RequestInfo">
-    update request_info
-    set request_number = #{requestNumber,jdbcType=VARCHAR},
-      request_org = #{requestOrg,jdbcType=VARCHAR},
-      request_time = #{requestTime,jdbcType=DATE},
-      request_title = #{requestTitle,jdbcType=VARCHAR},
-      request_content = #{requestContent,jdbcType=VARCHAR},
-      is_valid = #{isValid,jdbcType=INTEGER},
-      is_audit = #{isAudit,jdbcType=INTEGER},
-      creator_id = #{creatorId,jdbcType=INTEGER},
-      create_time = #{createTime,jdbcType=DATE},
-      editor_id = #{editorId,jdbcType=INTEGER},
-      edit_time = #{editTime,jdbcType=DATE},
-      auditor_id = #{auditorId,jdbcType=INTEGER},
-      audit_time = #{auditTime,jdbcType=DATE}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <select id="findAllList" resultMap="BaseResultMap">
-	select
-		r.id AS id,
-		r.request_number AS requestNumber,
-		r.request_org AS requestOrg,
-		r.request_time AS requestTime,
-		r.request_title AS requestTitle,
-		r.request_content AS requestContent,
-		r.is_valid AS isValid,
-		r.is_audit AS isAudit,
-		s.name AS creatorName,
-		r.create_time AS createTime,
-		u.name AS editorName,
-		r.edit_time AS editTime,
-		e.name AS currentName,
-		r.audit_time AS auditTime
-	from request_info r
-	left join sys_user s on r.creator_id=s.id
-	left join sys_user u on r.editor_id=u.id
-	left join sys_user e on r.auditor_id=e.id
-	<trim prefix="where" prefixOverrides="AND|OR">
-		<if test="requestTitle != null and requestTitle != ''">
-				AND r.request_title like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
-		</if>
-		<if test="requestContent != null and requestContent != ''">
-				AND r.request_content like 
-					<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
-		</if>
-		<if test="requestNumber != null and requestNumber != ''">
-				AND r.request_number=#{requestNumber}
-		</if>
-		<if test="isAudit != null">
-				AND r.is_audit=${isAudit}
-		</if>
-		<if test=" timeType = 'requestTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND r.request_time between #{beginDate} and #{endDate}
-	 	</if>
-		<if test="timeType = 'createTime' and beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-				AND (r.create_time between #{beginDate} and #{endDate}) or (r.audit_time between #{beginDate} and #{endDate})
-		</if> 
-	</trim>
-	order by r.request_time desc
-  </select>
 </mapper>

src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml

@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.nis.web.dao.configuration.ServiceDictInfoDao" >
+  
+  <resultMap id="dictResultMap" type="com.nis.domain.configuration.ServiceDictInfo" >
+    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+     <!-- 父id -->
+	    <association property="parent" javaType="com.nis.domain.configuration.ServiceDictInfo">
+	     <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    </association>
+	 <!-- 创建人员 -->
+        <association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+	 <!-- 修改人员 -->
+        <association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
+	     <id property="id" column="id"/>
+		<result property="loginId" column="login_id"/>
+		<result property="name" column="name"/>
+	    </association>
+  </resultMap>
+  <resultMap id="dictResultSimpleMap" type="com.nis.domain.configuration.ServiceDictInfo" >
+	    <id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
+	    <result column="item_type" property="itemType" jdbcType="INTEGER" />
+	    <result column="item_code" property="itemCode" jdbcType="INTEGER" />
+	    <result column="item_value" property="itemValue" jdbcType="VARCHAR" />
+	    <result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
+	    <result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+  </resultMap>
+    <sql id="serviceDictInfoColumns">
+		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.parent_id AS "parent.serviceDictId",
+		s.is_leaf AS isLeaf,
+		s.is_valid AS isValid,
+		s.creator_id AS "serviceDictCreator.id",
+		s.create_time AS createTime,
+		s.editor_id AS "serviceDictEditor.id",
+		s.edit_time AS editTime
+	</sql>
+    <sql id="serviceDictInfoColumnsSimple">
+		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
+	</sql>
+  
+  
+  
+  <!-- 查询顶层分页列表 (==)-->
+    <select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
+	
+	<if test="itemValue != null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type = #{itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+   <!-- 查询顶层分页列表 (!=)-->
+<select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1 AND parent_id = 0
+	
+	<if test="itemValue != null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type != #{itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+   
+  
+  
+  
+  
+  <!-- 查出所有 -->
+      <select id="findAllDictList" resultType="serviceDictInfo">
+		SELECT
+			<include refid="serviceDictInfoColumns"/>
+		FROM service_dict_info s
+		<include refid="menuJoins"/>
+		WHERE s.is_valid =1 
+	</select>
+
+	<!-- 查询所有非叶子配置 -->
+	<select id="findAllNoLeafDictList" resultType="com.nis.domain.configuration.ServiceDictInfo" parameterType="java.lang.Integer">
+	SELECT 
+	<include refid="serviceDictInfoColumns"/>
+	FROM service_dict_info s
+	WHERE s.is_valid = 1 AND s.is_leaf = 0 AND item_type = #{itemType}
+	</select>
+
+  
+    <!-- 条件查询分页(==) -->
+        <select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1  
+	
+	<if test="itemType != null and itemType != '' " >
+      AND item_type like '%${itemType}%'
+    </if>
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemValue!= null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+       
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+  
+      <!-- 条件查询分页(!=) -->
+        <select id="findDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
+	SELECT * FROM service_dict_info WHERE  is_valid=1  
+	
+    <if test="itemCode != null and itemCode != '' " >
+      AND item_code like '%${itemCode}%'
+    </if>
+    <if test="itemValue!= null and itemValue != '' " >
+      AND item_value like '%${itemValue}%'
+    </if>
+    <if test="itemType != null and itemType != '' " >
+      AND item_type != ${itemType}
+    </if>
+    <if test="beginDate !=null" >
+      AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
+    </if>
+    <if test="endDate !=null" >
+       AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
+       
+    </if> 
+    
+    <choose>
+		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			ORDER BY ${page.orderBy}
+		</when>
+		<otherwise>
+			ORDER BY create_time desc
+		</otherwise>
+	</choose>
+    
+  </select>
+
+  
+  <!-- 根据主键查询字典详细信息 -->
+  
+  <select id="getDictById" resultType="com.nis.domain.configuration.ServiceDictInfo">
+  select 
+  <include refid="serviceDictInfoColumns"/>
+  from service_dict_info s where s.service_dict_id = #{serviceDictId}
+  </select>
+  
+    <!-- 根据上级id选出所有下级 -->
+  
+  <select id="getDictByParentId" resultMap="dictResultMap">
+  select *
+  from service_dict_info s where parent_id = #{parentId}
+  </select>
+  
+  
+    <!-- 根据itemCode查询字典对象列表 -->
+  
+  <select id="findByItemCode" resultType="com.nis.domain.configuration.ServiceDictInfo">
+  select 
+  <include refid="serviceDictInfoColumns"/>
+  from service_dict_info s where s.item_code = #{itemCode}
+  </select>
+  
+  
+  
+  <!-- 新增字典信息 -->
+  
+     <insert id="insertDict" parameterType="com.nis.domain.configuration.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
+    insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
+    values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER}, 
+             #{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR}, 
+             #{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER}, 
+             #{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+             #{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
+  </insert>
+  
+
+  
+  <!-- 修改 -->
+  	<update id="update">
+		UPDATE service_dict_info s SET 
+	    s.service_dict_id = #{serviceDictId},
+		s.item_type = #{itemType},
+		s.item_code = #{itemCode},
+		s.item_value = #{itemValue},
+		s.item_desc = #{itemDesc},
+		s.parent_id = #{parent.serviceDictId},
+		s.is_leaf = #{isLeaf},
+		s.creator_id = #{serviceDictCreator.id},
+		s.editor_id = #{serviceDictEditor.id},
+		s.edit_time = #{editTime}
+		WHERE s.service_dict_id = #{serviceDictId}
+	</update>
+  
+  <!-- 删除 -->
+  
+  <update id="delete">
+  UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
+  </update>
+  
+  <select id="findItemDict" resultMap="dictResultSimpleMap">
+   select 
+   <include refid="serviceDictInfoColumnsSimple" />
+   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
+   </select>
+  <select id="findAllItemDict" resultMap="dictResultSimpleMap">
+   select 
+   <include refid="serviceDictInfoColumnsSimple" />
+   from service_dict_info s where   s.is_leaf = 0 and s.item_type=#{itemType};
+   </select>
+   
+   	<sql id="menuJoins">
+		LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id
+    </sql>
+
+   
+   
+   
+   
+   
+ 
+</mapper>

src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml

@@ -178,8 +178,7 @@
 		</choose> -->
 		<trim prefix="," prefixOverrides=",">
 			, 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
+			,ri.request_title as requestName
-			,sdil.item_value as lableName
 		</trim>
 		from ${tableName} r 
 		left join sys_user s on r.creator_id=s.id

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.java

@@ -0,0 +1,8 @@
+package com.nis.web.dao.configuration;
+
+import com.nis.domain.configuration.TaskInfo;
+import com.nis.web.dao.CrudDao;
+import com.nis.web.dao.MyBatisDao;
+@MyBatisDao
+public interface TaskInfoDao extends CrudDao<TaskInfo>{
+}

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.nis.web.dao.configuration.TaskInfoDao">
+  <resultMap id="BaseResultMap" type="com.nis.domain.configuration.TaskInfo">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="task_name" jdbcType="VARCHAR" property="taskName" />
+    <result column="task_org" jdbcType="VARCHAR" property="taskOrg" />
+    <result column="task_time" jdbcType="DATE" property="taskTime" />
+    <result column="task_desc" jdbcType="VARCHAR" property="taskDesc" />
+    <result column="is_valid" jdbcType="INTEGER" property="isValid" />
+    <result column="is_audit" jdbcType="INTEGER" property="isAudit" />
+    <result column="creator_id" jdbcType="INTEGER" property="creatorId" />
+    <result column="create_time" jdbcType="DATE" property="createTime" />
+    <result column="editor_id" jdbcType="INTEGER" property="editorId" />
+    <result column="edit_time" jdbcType="DATE" property="editTime" />
+    <result column="auditor_id" jdbcType="INTEGER" property="auditorId" />
+    <result column="audit_time" jdbcType="DATE" property="auditTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, task_name, task_org, task_time, task_desc, is_valid, is_audit, creator_id, create_time, 
+    editor_id, edit_time, auditor_id, audit_time
+  </sql>
+  
+  <select id="findList" parameterType="com.nis.domain.configuration.TaskInfo" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from task_info
+    <if test="id!=null">
+   	where id = #{id,jdbcType=BIGINT}
+    </if>
+  </select>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from task_info
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <insert id="insert" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info (id, task_name, task_org, 
+      task_time, task_desc, is_valid, 
+      is_audit, creator_id, create_time, 
+      editor_id, edit_time, auditor_id, 
+      audit_time)
+    values (#{id,jdbcType=BIGINT}, #{taskName,jdbcType=VARCHAR}, #{taskOrg,jdbcType=VARCHAR}, 
+      #{taskTime,jdbcType=DATE}, #{taskDesc,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, 
+      #{isAudit,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=DATE}, 
+      #{editorId,jdbcType=INTEGER}, #{editTime,jdbcType=DATE}, #{auditorId,jdbcType=INTEGER}, 
+      #{auditTime,jdbcType=DATE})
+  </insert>
+  <insert id="insertSelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    insert into task_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="taskName != null">
+        task_name,
+      </if>
+      <if test="taskOrg != null">
+        task_org,
+      </if>
+      <if test="taskTime != null">
+        task_time,
+      </if>
+      <if test="taskDesc != null">
+        task_desc,
+      </if>
+      <if test="isValid != null">
+        is_valid,
+      </if>
+      <if test="isAudit != null">
+        is_audit,
+      </if>
+      <if test="creatorId != null">
+        creator_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="editorId != null">
+        editor_id,
+      </if>
+      <if test="editTime != null">
+        edit_time,
+      </if>
+      <if test="auditorId != null">
+        auditor_id,
+      </if>
+      <if test="auditTime != null">
+        audit_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="taskName != null">
+        #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        #{auditTime,jdbcType=DATE},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    <set>
+      <if test="taskName != null">
+        task_name = #{taskName,jdbcType=VARCHAR},
+      </if>
+      <if test="taskOrg != null">
+        task_org = #{taskOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="taskTime != null">
+        task_time = #{taskTime,jdbcType=DATE},
+      </if>
+      <if test="taskDesc != null">
+        task_desc = #{taskDesc,jdbcType=VARCHAR},
+      </if>
+      <if test="isValid != null">
+        is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+      <if test="isAudit != null">
+        is_audit = #{isAudit,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=DATE},
+      </if>
+      <if test="editorId != null">
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      <if test="editTime != null">
+        edit_time = #{editTime,jdbcType=DATE},
+      </if>
+      <if test="auditorId != null">
+        auditor_id = #{auditorId,jdbcType=INTEGER},
+      </if>
+      <if test="auditTime != null">
+        audit_time = #{auditTime,jdbcType=DATE},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.nis.domain.configuration.TaskInfo">
+    update task_info
+    set task_name = #{taskName,jdbcType=VARCHAR},
+      task_org = #{taskOrg,jdbcType=VARCHAR},
+      task_time = #{taskTime,jdbcType=DATE},
+      task_desc = #{taskDesc,jdbcType=VARCHAR},
+      is_valid = #{isValid,jdbcType=INTEGER},
+      is_audit = #{isAudit,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=DATE},
+      editor_id = #{editorId,jdbcType=INTEGER},
+      edit_time = #{editTime,jdbcType=DATE},
+      auditor_id = #{auditorId,jdbcType=INTEGER},
+      audit_time = #{auditTime,jdbcType=DATE}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml

@@ -41,6 +41,9 @@
 			<if test="serviceName != null and serviceName != ''">
 				and ssi.service_name like CONCAT('%', #{serviceName}, '%')
 			</if>
+			<if test="serviceId != null and serviceId != ''">
+				and ssi.service_id like CONCAT('%', #{serviceId}, '%')
+			</if>
 			<if test="action != null">
 				and ssi.action=#{action}
 			</if>

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<D extends CrudDao<T>, T extends BaseEntity<T>>
 			}
 		}
 	}
+	/**
+	 * 
+	 * 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<MaatCfg> 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;
+	}
 }

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<ComplexStringCfgDao,Com
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public int addStringCfg(ComplexkeywordCfg cfg){
 		if(!StringUtils.isBlank(cfg.getTableName())){
 			return complexStringCfgDao.insert(cfg);
@@ -53,7 +52,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public int updateStringCfg(ComplexkeywordCfg cfg){
 		if(!StringUtils.isBlank(cfg.getTableName())){
 			return complexStringCfgDao.updateByPrimaryKeySelective(cfg);
@@ -77,7 +76,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public int auditStringCfg(ComplexkeywordCfg cfg){
 		if(!StringUtils.isBlank(cfg.getTableName())){
 			return complexStringCfgDao.audit(cfg);
@@ -101,7 +100,7 @@ public class ComplexStringCfgService extends CrudService<ComplexStringCfgDao,Com
 	 * @exception 
 	 * @since  1.0.0
 	 */
-	@Transactional(readOnly=false,rollbackFor=DataAccessException.class)
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public int deleteStringCfg(ComplexkeywordCfg cfg){
 		if(!StringUtils.isBlank(cfg.getTableName())){
 			return complexStringCfgDao.updateValid(cfg);

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -29,7 +29,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	 * @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<IpCfgDao,BaseIpCfg> {
 	 * @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<IpCfgDao,BaseIpCfg> {
 	 * @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<IpCfgDao,BaseIpCfg> {
 	 * @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);

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<NumCfgDao,NumBoundaryCfg> {
 	 * @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<NumCfgDao,NumBoundaryCfg> {
 	 * @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<NumCfgDao,NumBoundaryCfg> {
 	 * @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<NumCfgDao,NumBoundaryCfg> {
 	 * @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);
 	} 

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -11,9 +11,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.TaskInfo;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.RequestInfoDao;
+import com.nis.web.dao.configuration.TaskInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -23,6 +25,8 @@ public class RequestInfoService extends BaseService{
 
 	@Autowired
 	private RequestInfoDao requestInfoDao;
+	@Autowired
+	private TaskInfoDao taskInfoDao;
 	
 	public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
 		// 设置分页参数
@@ -81,4 +85,8 @@ public class RequestInfoService extends BaseService{
 		RequestInfo requestInfo=new RequestInfo();
 		return requestInfoDao.findAllList(requestInfo);
 	}
+
+	public List<TaskInfo> showTask(TaskInfo taskInfo) {
+		return taskInfoDao.findList(taskInfo);
+	}
 }

src/main/java/com/nis/web/service/configuration/StringCfgService.java

@@ -29,7 +29,7 @@ public class StringCfgService extends CrudService<StringCfgDao,BaseStringCfg> {
 	 * @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<StringCfgDao,BaseStringCfg> {
 	 * @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<StringCfgDao,BaseStringCfg> {
 	 * @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<StringCfgDao,BaseStringCfg> {
 	 * @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);

src/main/resources/generatorConfig.xml

@@ -5,35 +5,35 @@
    "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
   
  <generatorConfiguration>
-   <classPathEntry location="C:\Users\chenghui\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
+   <classPathEntry location="C:\Users\Administrator\.m2\repository\mysql\mysql-connector-java\5.1.36\mysql-connector-java-5.1.36.jar" />
  <context id="mysqlTables" targetRuntime="MyBatis3">
    <commentGenerator>
      <property name="suppressAllComments" value="true"/>
    </commentGenerator>
    <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-         connectionURL="jdbc:mysql://192.168.10.2:3306/bjbusxf?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
+         connectionURL="jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&amp;characterEncoding=UTF-8&amp;zeroDateTimeBehavior=convertToNull"
-         userId="root" password="ictsoft">
+         userId="dfh" password="111111">
     </jdbcConnection>
    <javaTypeResolver>
       <property name="forceBigDecimals" value="false"/>
    </javaTypeResolver>
    
-   <javaModelGenerator targetPackage="com.nis.domain" targetProject="bjbusxf/src/main/java">
+   <javaModelGenerator targetPackage="com.nis.domain.configuration" targetProject="gwall/src/main/java">
        <property name="enableSubPackages" value="true"/>
        <property name="trimStrings" value="true"/>
    </javaModelGenerator>
     
-   <sqlMapGenerator targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+   <sqlMapGenerator targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
         <property name="enableSubPackages" value="true"/>
    </sqlMapGenerator>
     
-  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao" targetProject="bjbusxf/src/main/java">
+  <javaClientGenerator type="XMLMAPPER" targetPackage="com.nis.web.dao.configuration" targetProject="gwall/src/main/java">
      <property name="enableSubPackages" value="true"/>
    </javaClientGenerator>
   
    
-    <table  tableName="reg_attach_info" 
+    <table  tableName="task_info" 
-   		domainObjectName="regAttachInfo" 
+   		domainObjectName="TaskInfo" 
    		enableCountByExample="false" 
    		enableSelectByExample="false" 
    		enableUpdateByExample="false" 

src/main/resources/messages/message_en.properties

@@ -108,14 +108,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,16 +123,21 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
 
 #==========message begin=====================
 required=This field is required\uff01
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message end=====================

src/main/resources/messages/message_ru.properties

@@ -108,14 +108,14 @@ edit_time=edittime
 
 #============laihan begin======================
 refresh=refresh
-add_request=add request
+add=add
 request_number=request number
 state=state
 created=created
+examine=examine
 unapproved=unapproved
 approved=approved
 title=title
-task=task
 request_time=request time
 operate_time=operate time
 search=search
@@ -123,15 +123,21 @@ request_organization=request organization
 operator=operator
 content=content
 remarks=remarks
-update_request=update request
 operation=operation
 submit=submit
 cancel=cancel
 begin_date=begin date
 end_date=end date
 delete=delete
+special_task=special task
 #============laihan end======================
 
+
 #==========message begin=====================
 required=This field is required！
+select=Please select
+date_list=Date List
+confirm_message=Are you sure?
+fill_loginName=Please fill in the loginName
+fill_loginPassWord=Please fill in the passWord
 #==========message end=====================

src/main/resources/messages/message_zh_CN.properties

@@ -107,14 +107,14 @@ edit_time=\u4fee\u6539\u65f6\u95f4
 
 #==========laihan begin=====================
 refresh=\u5237\u65b0
-add_request=\u65b0\u589e\u6765\u51fd
+add=\u65b0\u589e
 request_number=\u6765\u51fd\u51fd\u53f7
 state=\u72b6\u6001
 created=\u672a\u5ba1\u6838
+examine=\u5ba1\u6838
 unapproved=\u672a\u901a\u8fc7
-approved=\u5ba1\u6838\u901a\u8fc7
+approved=\u5df2\u901a\u8fc7
 title=\u6807\u9898
-task=\u4efb\u52a1
 request_time=\u6765\u51fd\u65f6\u95f4
 operate_time=\u64cd\u4f5c\u65f6\u95f4
 search=\u641c\u7d22
@@ -122,15 +122,21 @@ request_organization=\u6765\u51fd\u5355\u4f4d
 operator=\u64cd\u4f5c\u5458
 content=\u5185\u5bb9
 remarks=\u5907\u6ce8
-update_request=\u4fee\u6539\u6765\u51fd
 operation=\u64cd\u4f5c
 submit=\u63d0\u4ea4
 cancel=\u53d6\u6d88
 begin_date=\u5f00\u59cb\u65f6\u95f4
 end_date=\u7ed3\u675f\u65f6\u95f4
 delete=\u5220\u9664
+special_task=\u4e13\u9879\u4efb\u52a1
 #==========yewu zidian end=====================
 
 #==========message begin=====================
 required=\u4e0d\u80fd\u4e3a\u7a7a!
+select=--\u8bf7\u9009\u62e9--
+date_list=\u6570\u636e\u5217\u8868
+confirm_message=\u786e\u5b9a\u5417\uff1f
+fill_loginName=\u8bf7\u586b\u5199\u767b\u5f55\u8d26\u53f7
+fill_loginPassWord=\u8bf7\u586b\u5199\u767b\u5f55\u5bc6\u7801
+
 #==========message end=====================

src/main/webapp/WEB-INF/include/form/basicInfo.jsp

@@ -24,10 +24,25 @@
            <div class="col-md-8">
            	 <select name="classify" multiple class="selectpicker form-control" title="--请选择--">
                	<c:forEach items="${fls}" var="fl">
-               		<option value="${fl.item_code}"
+               		<c:choose>
-               		<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
+               			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
-               		 <c:if test="${fl.item_code==_cfg.classify}">selected</c:if>
+               				<option value="${fl.itemCode}">${fl.itemValue}</option>
-               		>${fl.item_value}</option>
+               			</c:when>
+               			<c:when test="${fn:contains(_cfg.classify,',')}">
+               			<option value="${fl.itemCode}"
+               				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
+		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
+		               			<c:if test="${fl.itemCode==_classify}">selected</c:if>
+               				</c:forEach>
+               			>${fl.itemValue}</option>	
+               			</c:when>
+               			<c:otherwise>
+               				<option value="${fl.itemCode}"
+		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
+		               			<c:if test="${fl.itemCode==_classify}">selected</c:if>
+		               			>${fl.itemValue}</option>
+               			</c:otherwise>
+               		</c:choose>
                	</c:forEach>
              </select>
            </div>
@@ -43,10 +58,19 @@
              <div class="col-md-8">
                 <select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
                		<c:forEach items="${xzs}" var="xz">
-               		<option value="${xz.item_code}"
+	               		<c:choose>
-               			<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
+	               			<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
-               		 <c:if test="${xz.item_code==_cfg.attribute}">selected</c:if>
+	               				<option value="${xz.itemCode}">${xz.itemValue}</option>
-               		>${xz.item_value}</option>
+	               			</c:when>
+	               			<c:otherwise>
+	               				<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
+	               				<option value="${xz.itemCode}"
+	               				<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
+	               		 		<c:if test="${xz.itemCode==_attribute}">selected</c:if>
+	               				>${xz.itemValue}</option>
+	               				</c:forEach>
+	               			</c:otherwise>
+	               		</c:choose>
                		</c:forEach>
              	</select>
              </div>
@@ -58,11 +82,21 @@
              <div class="col-md-8">
                 <select name="lable" multiple class="selectpicker form-control" title="--请选择--">
                		<c:forEach items="${lables}" var="lable">
-               		<option value="${lable.item_code}"
+	               		<c:choose>
-               			<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
+	               			<c:when test="${_cfg.lable==null or _cfg.lable==''}">
-               		 <c:if test="${lable.item_code==_cfg.lable}">selected</c:if>
+	               				<option value="${lable.itemCode}">${lable.itemValue}</option>
-               		>${lable.item_value}</option>
+	               			</c:when>
-               		</c:forEach>
+	               			<c:otherwise>
+	               				<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
+	               					<option value="${lable.itemCode}"
+			               			<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
+				               		<c:if test="${lable.itemCode==_lable}">selected</c:if>
+				               		>${lable.itemValue}</option>
+	               				</c:forEach>
+	               			</c:otherwise>
+	               		</c:choose>
+	               		
+	               		</c:forEach>
              	</select>
              </div>
          </div>

src/main/webapp/WEB-INF/include/form/ipInfo.jsp

@@ -122,7 +122,7 @@
         </div>
     </div>
 </div>
-<div class="row">
+<%-- <div class="row">
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3">协议ID</label>
@@ -143,34 +143,7 @@
             	 	<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
             	 	<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
             	 </select>
-                 <%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
+                 <input class="form-control" type="hidden" name="action" value="${_cfg.action}">
-            </div>
-        </div>
-    </div>
-</div>
-<%-- <div class="row">
-    <div class="col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3">有效标识</label>
-            <div class="col-md-8">
-                <input class="form-control" type="text" name="isValid" value="${_cfg.isValid}">
-            </div>
-        </div>
-    </div>
-    <div class="col-md-6">
-        <div class="form-group ">
-            <label class="control-label col-md-3">是否审核</label>
-            <div class="col-md-8">
-            	<label class="radio-inline">
-            		<input type="radio" name="isAudit" value="1"
-            			<c:if test="${_cfg.isAudit==1}"></c:if>
-            		>是
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="isAudit" value="0"
-            			<c:if test="${_cfg.isAudit==0}"></c:if>
-            		>否
-            	</label>
             </div>
         </div>
     </div>

src/main/webapp/WEB-INF/include/header.jsp

@@ -60,4 +60,6 @@
 <script src="${pageContext.request.contextPath}/static/layouts/layout/scripts/layout.js" type="text/javascript"></script>
 <!-- END THEME LAYOUT SCRIPTS -->
 
+<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
+<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
 

src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp

@@ -23,8 +23,6 @@ $(function(){
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<c:if test="${empty _cfg.cfgId}">新增</c:if>
-		<c:if test="${not empty _cfg.cfgId}">修改</c:if>
 	</h3>
 	
 	<div class="row">
@@ -32,9 +30,9 @@ $(function(){
 			<div class="portlet box blue">
                   <div class="portlet-title">
                      <div class="caption">
-                         <i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
+                         <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}">新增</c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}">修改</c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
                           <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp

@@ -25,11 +25,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">新增<spring:message code="${cfgName}"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>详情
+		<spring:message code="${cfgName}"></spring:message>
 	</h3>
 
 	<div class="row">
@@ -37,7 +37,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
+						<i class="fa fa-cogs"></i><spring:message code="列表"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,7 +85,7 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-bordered text-nowrap">
+						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
 									<th>配置ID</th>
@@ -93,14 +93,14 @@
 									<th>匹配区域</th>
 									<th>关键字</th>
 									<th>管控类型</th>
-									<th>业务id</th>
+									<!-- <th>业务id</th> -->
 									<th>来函</th>
-									<th>编译id</th>
+									<!-- <th>编译id</th> -->
 									<th>是否区域管控</th>
 									<th>分类</th>
 									<th>性质</th>
 									<th>标签</th>
-									<th>区域生效id</th>
+									<!-- <th>区域生效id</th> -->
 									<th>有效标识</th>
 									<th>是否审核</th>
 									<th>创建人员</th>
@@ -127,17 +127,38 @@
 										<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
 										<c:if test="${8 eq cfg.action }">灰名单</c:if>
 									</td>
-									<td>${cfg.serviceId }</td>
+									<%-- <td>${cfg.serviceId }</td> --%>
 									<td>${cfg.requestName }</td>
-									<td>${cfg.compileId }</td>
+									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}">否</c:if>
 										<c:if test="${cfg.isAreaEffective==1}">是</c:if>
 									</td>
-									<td>${cfg.classifyName }</td>
+									<td>
-									<td>${cfg.attributeName }</td>
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
-									<td>${cfg.lableName }</td>
+										<c:forEach items="${fls}" var="fl">
-									<td>${cfg.areaEffectiveIds }</td>
+											<c:if test="${classifyId==fl.itemCode}">
+											${fl.itemValue},
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									${classifyName[status]}
+									</td>
+									<td>
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<td>
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${cfg.isValid==0}">否</c:if>
 										<c:if test="${cfg.isValid==1}">是</c:if>
@@ -172,7 +193,7 @@
 									        		<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${cfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="修改配置"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/complex/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/complex/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/complex/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>

src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp

@@ -70,8 +70,6 @@ $(function(){
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<c:if test="${empty _cfg.cfgId}">新增</c:if>
-		<c:if test="${not empty _cfg.cfgId}">修改</c:if>
 	</h3>
 	
 	<div class="row">
@@ -79,9 +77,9 @@ $(function(){
 			<div class="portlet box blue">
                   <div class="portlet-title">
                      <div class="caption">
-                         <i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
+                         <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}">新增</c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}">修改</c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
                           <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp

@@ -25,11 +25,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">新增<spring:message code="${cfgName}"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>详情
+		<spring:message code="${cfgName}"></spring:message>
 	</h3>
 
 	<div class="row">
@@ -37,7 +37,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
+						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,10 +85,10 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-bordered text-nowrap">
+						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>配置ID</th>
+									<th>序列</th>
 									<th>配置描述</th>
 									<th>ip类型</th>
 									<th>源IP地址</th>
@@ -101,16 +101,16 @@
 									<th>目的端口掩码</th>
 									<th>方向</th>
 									<th>协议</th>
-									<th>协议ID</th>
+									<!-- <th>协议ID</th> -->
 									<th>管控类型</th>
-									<th>业务id</th>
+									<!-- <th>业务id</th> -->
 									<th>来函</th>
-									<th>编译id</th>
+									<!-- <th>编译id</th> -->
 									<th>是否区域管控</th>
 									<th>分类</th>
 									<th>性质</th>
 									<th>标签</th>
-									<th>区域生效id</th>
+									<!-- <th>区域生效id</th> -->
 									<th>有效标识</th>
 									<th>是否审核</th>
 									<th>创建人员</th>
@@ -123,9 +123,9 @@
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="ipCfg">
+								<c:forEach items="${page.list }" var="ipCfg" varStatus="status" step="1">
-									<tr>
+									<tr pId="${status.index}">
-									<td>${ipCfg.cfgId }</td>
+									<td>${status.index+1 }</td>
 									<td>${ipCfg.cfgDesc }</td>
 									<td>V${ipCfg.ipType }</td>
 									<td>${ipCfg.srcIp }</td>
@@ -138,7 +138,7 @@
 									<td>${ipCfg.dstPortMask }</td>
 									<td>${ipCfg.direction }</td>
 									<td>${ipCfg.protocol }</td>
-									<td>${ipCfg.protocolId }</td>
+									<%-- <td>${ipCfg.protocolId }</td> --%>
 									<td>
 										<c:if test="${1 eq ipCfg.action }">阻断</c:if>
 										<c:if test="${2 eq ipCfg.action }">监测</c:if>
@@ -147,17 +147,38 @@
 										<c:if test="${7 eq ipCfg.action }">封堵监测白名单</c:if>
 										<c:if test="${8 eq ipCfg.action }">灰名单</c:if>
 									</td>
-									<td>${ipCfg.serviceId }</td>
+									<%-- <td>${ipCfg.serviceId }</td> --%>
 									<td>${ipCfg.requestName }</td>
-									<td>${ipCfg.compileId }</td>
+									<%-- <td>${ipCfg.compileId }</td> --%>
 									<td>
 										<c:if test="${ipCfg.isAreaEffective==0}">否</c:if>
 										<c:if test="${ipCfg.isAreaEffective==1}">是</c:if>
 									</td>
-									<td>${ipCfg.classifyName }</td>
+									<td>
-									<td>${ipCfg.attributeName }</td>
+									<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
-									<td>${ipCfg.lableName }</td>
+										<c:forEach items="${fls}" var="fl">
-									<td>${ipCfg.areaEffectiveIds }</td>
+											<c:if test="${classifyId==fl.itemCode}">
+											${fl.itemValue},
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									${classifyName[status]}
+									</td>
+									<td>
+									<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<td>
+									<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<%-- <td>${ipCfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${ipCfg.isValid==0}">否</c:if>
 										<c:if test="${ipCfg.isValid==1}">是</c:if>
@@ -192,7 +213,7 @@
 									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${ipCfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="修改配置"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>

src/main/webapp/WEB-INF/views/cfg/requestForm.jsp

@@ -7,18 +7,18 @@
 </head>
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="update_request"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add_request"/></c:if></div>
+						<i class="fa fa-gift"></i><c:if test="${not empty requestInfo.id}"><spring:message code="edit"/></c:if><c:if test="${empty requestInfo.id}"><spring:message code="add"/></c:if></div>
 				</div>
 				
 				<div class="portlet-body form">
 					<!-- BEGIN FORM-->
-					<form:form action="${ctx}/cfg/request/saveOrUpdate" class="form-horizontal" id="inputForm" method="post" >
+					<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
 					<sys:message content="${message}"/>
 					<input type="hidden"  name="id" value="${requestInfo.id}"/>
 						<div class="form-body">
@@ -47,12 +47,23 @@
 									<input type="text" class="form-control" name="requestTitle" value="${requestInfo.requestTitle}">
 								</div>
 							</div>
-							<div class="form-group last">
+							<div class="form-group">
-								<label class="col-md-3 control-label"><th><spring:message code="content"></spring:message>:</label>
+								<label class="col-md-3 control-label"><spring:message code="content"></spring:message>:</label>
 								<div class="col-md-4">
 									<input type="text" class="form-control" name="requestContent" value="${requestInfo.requestContent}">
 								</div>
 							</div>
+							<div class="form-group last">
+								<label class="col-md-3 control-label"><th><spring:message code="special_task"/>:</label>
+								<div class="col-md-4">
+									<form:select path="taskId" class="selectpicker select2">
+										<form:option value=""><spring:message code="select"/></form:option>
+										<c:forEach items="${taskInfos}" var="taskInfo">
+											<form:option value="${taskInfo.id}">${taskInfo.taskName}</form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+							</div>
 						</div>
 						<div class="form-actions">
 							<div class="row">

src/main/webapp/WEB-INF/views/cfg/requestList.jsp

@@ -8,15 +8,15 @@
 
 <body>
 
-<div class="content">
+<div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add_request"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button>
 	</div>
 	
 	<h3 class="page-title">
-		来函管理 
+		<spring:message code="requestInfo"></spring:message>
 	</h3>
 	
 	<div class="row">
@@ -24,7 +24,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="request_number"></spring:message>
+						<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 					</div>
 				</div>
 				<div class="portlet-body">
@@ -35,19 +35,20 @@
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<div class="col-md-12">
 							<spring:message code="state"/> : <form:select path="isAudit" class="select2">
-								<form:option value=""></form:option>
+								<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="0"><spring:message code="created"></spring:message></form:option>
 								<form:option value="1"><spring:message code="approved"></spring:message></form:option>
 							</form:select> 
 							
 							<select id="seltype">
+								<option value=""><spring:message code="select"></spring:message></option>
 								<option value="requestTitle"><spring:message code="title"></spring:message></option>
 								<option value="requestNumber"><spring:message code="request_number"></spring:message></option>
-								<option value="requestContent"><spring:message code="task"></spring:message></option>
+								<option value="requestContent"><spring:message code="content"></spring:message></option>
 							</select> <input id="intype">
 							 
-							<form:select id="timeType" name="timeType" path="timeType">
+							<form:select path="timeType">
-<%-- 								<form:option value=""></form:option> --%>
+							<form:option value=""><spring:message code="select"></spring:message></form:option>
 								<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
 								<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
 							</form:select> 
@@ -79,6 +80,7 @@
 									<th><spring:message code="operate_time"></spring:message></th>
 									<th><spring:message code="title"></spring:message></th>
 									<th><spring:message code="content"></spring:message></th>
+									<th><spring:message code="special_task"></spring:message></th>
 									<th><spring:message code="operation"></spring:message></th>
 								</tr>
 							</thead>
@@ -110,6 +112,7 @@
 									</td>
 									<td>${requestInfo.requestTitle }</td>
 									<td>${requestInfo.requestContent }</td>
+									<td>${requestInfo.taskName }</td>
 									<td>
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
@@ -117,12 +120,12 @@
 								      <!-- 审核未通过可修改 -->
 								        	<c:choose>
 									        	<c:when test="${requestInfo.isAudit eq '1'}">
-											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="cancel"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestCancelExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="approved"></spring:message></a></li>
+											        <li><a href="${ctx}/cfg/request/requestExamine?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="examine"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="update_request"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/request/form?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="edit"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('确定吗？', this.href)"><spring:message code="delete"></spring:message></a></li>
+								        			<li><a href="${ctx}/cfg/request/delete?id=${requestInfo.id}" onclick="return confirmx('<spring:message code="confirm_message"/>', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:otherwise>
 								        	</c:choose>
 									      </ul>

src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp

@@ -23,8 +23,6 @@ $(function(){
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<c:if test="${empty _cfg.cfgId}">新增</c:if>
-		<c:if test="${not empty _cfg.cfgId}">修改</c:if>
 	</h3>
 	
 	<div class="row">
@@ -32,9 +30,9 @@ $(function(){
 			<div class="portlet box blue">
                   <div class="portlet-title">
                      <div class="caption">
-                         <i class="fa fa-gift"></i><spring:message code="${cfgName}"></spring:message>
+                         <i class="fa fa-gift"></i>
-                        <c:if test="${empty _cfg.cfgId}">新增</c:if>
+                        <c:if test="${empty _cfg.cfgId}"><spring:message code="新增"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}">修改</c:if>
+						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
 					</div>
                       <!-- <div class="tools">
                           <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>

src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp

@@ -25,11 +25,11 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'">新增<spring:message code="${cfgName}"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="新增"></spring:message></button>
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>详情
+		<spring:message code="${cfgName}"></spring:message>
 	</h3>
 
 	<div class="row">
@@ -37,7 +37,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="${cfgName}"></spring:message>详情
+						<i class="fa fa-cogs"></i><spring:message code="详情"></spring:message>
 					</div>
 					<div class="tools">
 						<!-- <a href="javascript:;" class="collapse" data-original-title=""
@@ -85,21 +85,21 @@
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<table class="table table-bordered text-nowrap">
+						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<th>配置ID</th>
+									<th>序列</th>
 									<th>配置描述</th>
 									<th>配置关键词</th>
 									<th>管控类型</th>
-									<th>业务id</th>
+									<!-- <th>业务id</th> -->
 									<th>来函</th>
-									<th>编译id</th>
+									<!-- <th>编译id</th> -->
 									<th>是否区域管控</th>
 									<th>分类</th>
 									<th>性质</th>
 									<th>标签</th>
-									<th>区域生效id</th>
+									<!-- <th>区域生效id</th> -->
 									<th>有效标识</th>
 									<th>是否审核</th>
 									<th>创建人员</th>
@@ -112,9 +112,9 @@
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="cfg">
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td>${cfg.cfgId }</td>
+									<td>${status.index+1 }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.cfgKeywords }</td>
 									<td>
@@ -125,17 +125,38 @@
 										<c:if test="${7 eq cfg.action }">封堵监测白名单</c:if>
 										<c:if test="${8 eq cfg.action }">灰名单</c:if>
 									</td>
-									<td>${cfg.serviceId }</td>
+									<%-- <td>${cfg.serviceId }</td> --%>
 									<td>${cfg.requestName }</td>
-									<td>${cfg.compileId }</td>
+									<%-- <td>${cfg.compileId }</td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}">否</c:if>
 										<c:if test="${cfg.isAreaEffective==1}">是</c:if>
 									</td>
-									<td>${cfg.classifyName }</td>
+									<td>
-									<td>${cfg.attributeName }</td>
+									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
-									<td>${cfg.lableName }</td>
+										<c:forEach items="${fls}" var="fl">
-									<td>${cfg.areaEffectiveIds }</td>
+											<c:if test="${classifyId==fl.itemCode}">
+											${fl.itemValue},
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+									${classifyName[status]}
+									</td>
+									<td>
+									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<td>
+									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+										</c:forEach>
+									</c:forEach>
+									</td>
+									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
 									<td>
 										<c:if test="${cfg.isValid==0}">否</c:if>
 										<c:if test="${cfg.isValid==1}">是</c:if>
@@ -170,7 +191,7 @@
 									        		<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${cfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="修改配置"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/string/updateForm?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/string/auditCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        		<li><a href="${ctx}/cfg/string/deleteCfg?serviceId=${cfg.serviceId}&action=${cfg.action}&tableName=${cfg.tableName}&cfgId=${cfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
 									        	</c:when>

src/main/webapp/WEB-INF/views/login.jsp

@@ -47,10 +47,10 @@
                         <img src="${pageContext.request.contextPath}/static/pages/img/photo.jpg" class="login-avatar"> </div>
                     <form id="loginForm" class="login-form pull-left" action="${pageContext.request.contextPath }/login" method="post">
 						<div class="form-group">
-                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="请填写登录账号"/>
+                            <input id="username" name="username" type="text" class="form-control placeholder-no-fix " value="${username}" placeholder="<spring:message code='fill_loginName'/>"/>
                         </div>
                         <div class="form-group">
-                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="请填写登录密码"/>
+                        	<input type="password"  class="form-control placeholder-no-fix "  id="password" name="password" placeholder="<spring:message code='fill_loginPassWord'/>"/>
                         </div>
                         
                       <%--  <c:if test="${not empty isValidateCodeLogin or isValidateCodeLogin==true}">

src/main/webapp/WEB-INF/views/systemService/form.jsp

@@ -116,6 +116,9 @@
 	
 	//自动获取serviceId
 	function autoServiceId() {
+		if ("${systemServiceInfo.id}") {
+			return false;
+		}
 		var type = $("[name=tableType]").val();
 		var action = $("#action").val();
 		var serviceIdPre;
@@ -209,7 +212,7 @@
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-gift"></i>系统业务详情</div>
+						<i class="fa fa-gift"></i>详情</div>
 				</div>
 				
 				<div class="portlet-body form">
@@ -314,9 +317,8 @@
 							<div class="form-actions">
 								<div class="row">
 									<div class="col-md-offset-3 col-md-9">
-										<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value="保存"/></shiro:hasPermission>
+										<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>></shiro:hasPermission>
-										<%-- <shiro:hasPermission name="system:service:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission> --%>
+										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
-										<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">取消</button>
 									</div>
 								</div>
 							</div>

src/main/webapp/WEB-INF/views/systemService/list.jsp

@@ -28,14 +28,14 @@ function deleteService(id) {
 </script>
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'">刷新</button>
+		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/systemService/list'"><spring:message code="refresh"></spring:message></button>
 		<shiro:hasPermission name="system:service:view">
 			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/systemService/systemServiceform'">新增</button>
 		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
-		业务管理
+		系统业务管理
 	</h3>
 
 	<div class="row">
@@ -43,11 +43,11 @@ function deleteService(id) {
 			<div class="portlet box blue">
 				<div class="portlet-title">
 					<div class="caption">
-						<i class="fa fa-cogs"></i>业务列表
+						<i class="fa fa-cogs"></i>列表
 					</div>
 				</div>
 				
-				<div class="portlet-body"">
+				<div class="portlet-body">
 					<sys:message content="${message}"/>
 					<form:form id="searchForm" modelAttribute="systemServiceInfo" method="post">
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo }"/>
@@ -79,18 +79,23 @@ function deleteService(id) {
 								</span>
 								
 								<span class="search-item">
-									<span>名称 :</span>
+									<span>业务名称 :</span>
 									<form:input path="serviceName" htmlEscape="false" class="input-small"/>
 								</span>
 								
+								<span class="search-item">
+									<span>业务ID :</span>
+									<form:input path="serviceId" htmlEscape="false" class="input-small"/>
+								</span>
+								
 								<span class="search-item">
 									<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
-										<i class="fa fa-edit"></i> 搜索
+										<i class="fa fa-edit"></i> <spring:message code="search"></spring:message>
 									</button>
 								</span>
 							</div>
-						</form:form>
+						</div>
-					</div>
+					</form:form>
 					
 					<div class="table-responsive">
 						<table class="table table-bordered">
@@ -100,9 +105,9 @@ function deleteService(id) {
 									<th style="width:8%">业务ID</th>
 									<th>动作</th>
 									<th>类型</th>
-									<th>创建人</th>
+									<th><spring:message code="creator_id"></spring:message></th>
-									<th style="width:15%">创建时间</th>
+									<th style="width:15%"><spring:message code="create_time"></spring:message></th>
-									<th>描述</th>
+									<th><spring:message code="desc"></spring:message></th>
 									<th>操作</th>
 								</tr>
 							</thead>
@@ -110,7 +115,7 @@ function deleteService(id) {
 								<c:forEach items="${page.list }" var="ssi">
 								<tr>
 									<td>${ssi.serviceName }</td>
-									<td>${ssi.serviceId }</d>
+									<td>${ssi.serviceId }</td>
 									<td>
 										<c:if test="${1 eq ssi.action }">阻断</c:if>
 										<c:if test="${2 eq ssi.action }">监测</c:if>
@@ -129,8 +134,8 @@ function deleteService(id) {
 									<td>${ssi.serviceDesc }</td>
 									<td>
 										<shiro:hasPermission name="system:service:edit">
-											<span><a href="${ctx }/systemService/systemServiceform?id=${ssi.id }">修改</a></span>
+											<span><a href="${ctx }/systemService/systemServiceform?id=${ssi.id }"><spring:message code="edit"></spring:message></a></span>
-											<span><a href="javascript:void(0)" onclick="deleteService('${ssi.id }')">删除</a></span>
+											<span><a href="javascript:void(0)" onclick="deleteService('${ssi.id }')"><spring:message code="delete"></spring:message></a></span>
 										</shiro:hasPermission>
 									</td>
 								</tr>