diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java
index 188c6aaf4..cb23303aa 100644
--- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java
@@ -1,8 +1,11 @@
package com.nis.web.dao.configuration;
+import java.util.Date;
import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
@@ -28,4 +31,8 @@ public interface CommonPolicyDao {
public void deleteComplexStringCfg(CfgIndexInfo entity);
public void updateCfgValid(BaseCfg entity);
public void auditCfg(BaseCfg entity);
+ public void auditCfgBatch(@Param("tableName")String tableName,
+ @Param("entity")BaseCfg baseCfg,
+ @Param("compileIds")List compileIds,
+ @Param("requestId")Integer requestId);
}
diff --git a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
index 1b0da6ed4..67d4f21c0 100644
--- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
@@ -733,4 +733,30 @@
+
+ update ${tableName} set is_audit = #{entity.isAudit,jdbcType=INTEGER},
+ auditor_id = #{entity.auditorId,jdbcType=INTEGER},
+ audit_time = #{entity.auditTime,jdbcType=TIMESTAMP}
+
+ ,is_valid = #{entity.isValid,jdbcType=INTEGER}
+
+
+ ,cancel_request_id = #{requestId,jdbcType=INTEGER}
+
+
+
+ and asn_ip_group in
+
+ #{compileId}
+
+
+
+ and compile_id in
+
+ #{compileId}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 5a55368f3..f2788c3c7 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -52,6 +52,7 @@ import com.nis.util.DateUtils;
import com.nis.util.DictUtils;
import com.nis.util.ServiceConfigTemplateUtil;
import com.nis.util.StringUtil;
+import com.nis.web.dao.configuration.CommonPolicyDao;
import com.nis.web.dao.configuration.ConfigSynchronizationDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@@ -65,7 +66,8 @@ import com.nis.web.service.BaseService;
public class ConfigSynchronizationService extends BaseService{
@Autowired
protected ConfigSynchronizationDao configSynchronizationDao;
-
+ @Autowired
+ protected CommonPolicyDao commonPolicyDao;
/**
* 配置全量更新下发
* @param request
@@ -234,6 +236,13 @@ public class ConfigSynchronizationService extends BaseService{
asnGroupIds.add(cfg.getUserRegion4());
}
}
+
+ if(isUpdateCfg) {
+ if(!StringUtil.isEmpty(compileIds) && !StringUtil.isEmpty(entity.getTableName())) {
+ commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,compileIds,null);
+ }
+ }
+
if(cfgList!=null){
for(Map m:cfgList){
String tableName = m.get("tableName").toString();
@@ -254,6 +263,15 @@ public class ConfigSynchronizationService extends BaseService{
}else if("5".equals(m.get("cfgType"))){
fileList.addAll(configSynchronizationDao.getFileDigestList(tableName, compileIds));
}
+ if(isUpdateCfg) {
+ if(tableName.equals("asn_ip_cfg")){
+ if(!StringUtil.isEmpty(asnGroupIds)) {
+ commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,asnGroupIds,null);
+ }
+ }else{
+ commonPolicyDao.auditCfgBatch( tableName, entity,asnGroupIds,null);
+ }
+ }
}
}
//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号),分组复用的域配置不需要重新获取regionId,groupId