From 9206f064e74549a672cbc7a7c005ca8fa3368c11 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 4 Jun 2018 17:42:10 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=BD=ACmaat=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2、邮件配置审核增加摘要配置转换

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 src/main/java/com/nis/domain/maat/MaatCfg.java |  6 +++---
 .../java/com/nis/web/service/BaseService.java  | 18 ++++++++++++++++++
 .../service/configuration/MailCfgService.java  | 11 +++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java
index d859b91e0..468e5432a 100644
--- a/src/main/java/com/nis/domain/maat/MaatCfg.java
+++ b/src/main/java/com/nis/domain/maat/MaatCfg.java
@@ -419,7 +419,7 @@ public class MaatCfg implements Serializable {
 		@SerializedName("tableName")
 		private String cfgType;
 		@Expose
-		private Integer rawLen;
+		private Long rawLen;
 		@Expose
 		private String digest;
 		@Expose
@@ -446,10 +446,10 @@ public class MaatCfg implements Serializable {
 		public void setCfgType(String cfgType) {
 			this.cfgType = cfgType;
 		}
-		public Integer getRawLen() {
+		public Long getRawLen() {
 			return rawLen;
 		}
-		public void setRawLen(Integer rawLen) {
+		public void setRawLen(Long rawLen) {
 			this.rawLen = rawLen;
 		}
 		public String getDigest() {
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 61212e333..539ae4fb2 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -362,6 +362,24 @@ public abstract class BaseService {
 				cfg.setIsValid(baseCfg.getIsValid());
 				dstList.add(cfg);
 			}
+		}else if(cfgType==5){
+			for(int i=0;i<srcList.size();i++){
+				com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg();
+				BeanUtils.copyProperties(srcList.get(i), cfg);
+				GroupCfg group = new GroupCfg();
+				if(!cfg.getCfgType().equals(regionValue)){
+					group.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
+					group.setCompileId(baseCfg.getCompileId());
+					group.setAuditTime(baseCfg.getAuditTime());
+					group.setIsValid(baseCfg.getIsValid());
+					groupRelationList.add(group);
+				}
+				cfg.setGroupId(group.getGroupId());
+				cfg.setRegionId(ConfigServiceUtil.getId(3, 1).get(0));
+				cfg.setAuditTime(baseCfg.getAuditTime());
+				cfg.setIsValid(baseCfg.getIsValid());
+				dstList.add(cfg);
+			}
 		}else{
 			dstList.addAll(srcList);
 		}
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index bb109d514..445bf64ee 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -259,6 +259,17 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 				strRegionList=map.get("dstList");
 			}
 		}
+		if(entity.getDigestList()!=null && entity.getDigestList().size()>0){
+			FileDigestCfg cfg = new FileDigestCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(FileDigestCfg.getTablename());
+			mailCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(digestRegionList,entity.getDigestList(),5,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				digestRegionList=map.get("dstList");
+			}
+		}
 		//保存区域IP信息
 		if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
 			AreaIpCfg cfg = new AreaIpCfg();