diff options
4 files changed, 42 insertions, 2 deletions
diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java index 5c541aac6..b2f7df072 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java @@ -33,4 +33,8 @@ public interface CommonGroupManageDao extends CrudDao<CommonGroupInfo> { Integer getGroupIdByGroupName(@Param("groupName")String groupName, @Param("groupType")Integer groupType);
int insertBatch(List<CommonGroupInfo> list);
+
+ void reLoadGroupInfo(@Param("groupType")String groupType);
+
+ void deleteGroupRegionInfo(@Param("tableName")String tableName);
}
\ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml index ebf00cbb8..a3f9aabfe 100644 --- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml +++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml @@ -258,4 +258,17 @@ </trim>
</select>
+ <update id="reLoadGroupInfo" parameterType="java.lang.String">
+ UPDATE
+ policy_group_info
+ SET
+ ud_flag = 0
+ WHERE
+ is_valid != 0 AND group_type IN(${groupType})
+ </update>
+
+ <delete id="deleteGroupRegionInfo" parameterType="java.lang.String">
+ DELETE FROM ${tableName}
+ </delete>
+
</mapper>
\ No newline at end of file diff --git a/src/main/java/com/nis/web/service/SystemService.java b/src/main/java/com/nis/web/service/SystemService.java index 3335a82f6..ccaea7273 100644 --- a/src/main/java/com/nis/web/service/SystemService.java +++ b/src/main/java/com/nis/web/service/SystemService.java @@ -44,6 +44,7 @@ import com.nis.web.security.CacheSessionDAO; import com.nis.web.security.Servlets;
import com.nis.web.security.UserUtils;
import com.nis.web.service.basics.AsnGroupInfoService;
+import com.nis.web.service.basics.CommonGroupManageService;
@Service
public class SystemService extends BaseService{
@@ -62,6 +63,9 @@ public class SystemService extends BaseService{ private AsnGroupInfoService asnGroupInfoService;
@Autowired
+ private CommonGroupManageService commonGroupManageService;
+
+ @Autowired
private CommonPolicyDao commonPolicyDao;
@Autowired
@@ -198,7 +202,9 @@ public class SystemService extends BaseService{ for (String tableName : tableNameSet) {
commonPolicyDao.clearPolicies(tableName);
}
- // 初始化分组
+ // 初始化策略分组
+ commonGroupManageService.reLoadGroupInfo();
+ // 初始化ASN分组
asnGroupInfoService.reLoadGroupInfo();
// 失效定时任务
schedulerDao.inValidAllSchedule();
diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java index 16fb853f4..a5eb0465a 100644 --- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java +++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java @@ -347,6 +347,23 @@ public class CommonGroupManageService extends BaseService{ return flag;
}
-
+
+ public void reLoadGroupInfo() {
+ // 初始化策略分组信息
+ String groupType = Constants.IP_OBJ_GROUP_TYPE + "," + Constants.URL_OBJ_GROUP_TYPE + ","
+ + Constants.DOMAIN_OBJ_GROUP_TYPE + "," + Constants.SUBID_OBJ_GROUP_TYPE;
+ commonGroupManageDao.reLoadGroupInfo(groupType);
+
+ // 清空分组域配置信息
+ List<String> tableList = new ArrayList<String>();
+ tableList.add(IpCommCfg.getIndexTable());
+ tableList.add(UrlCommCfg.getTablename());
+ tableList.add(DomainCommCfg.getTablename());
+ tableList.add(ScriberIdCommCfg.getTablename());
+ for (String tableName : tableList) {
+ commonGroupManageDao.deleteGroupRegionInfo(tableName);
+ }
+
+ }
}
|