diff --git a/src/main/java/com/nis/web/dao/SysOfficeDao.java b/src/main/java/com/nis/web/dao/SysOfficeDao.java index 077cde2dc..48c2ae676 100644 --- a/src/main/java/com/nis/web/dao/SysOfficeDao.java +++ b/src/main/java/com/nis/web/dao/SysOfficeDao.java @@ -30,7 +30,4 @@ public interface SysOfficeDao extends TreeDao { List selectOfficeForLetter(Map hmap); - void clearPolicies(@Param("tableName")String tableName); - - } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SysOfficeDao.xml b/src/main/java/com/nis/web/dao/SysOfficeDao.xml index 9a202aa39..b1f50ea25 100644 --- a/src/main/java/com/nis/web/dao/SysOfficeDao.xml +++ b/src/main/java/com/nis/web/dao/SysOfficeDao.xml @@ -327,10 +327,4 @@ CONCAT('%,', #{id}, ',%') - - UPDATE ${tableName} - SET is_valid = -1, is_audit = 0 - WHERE is_valid != -1 - - \ No newline at end of file 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 f44ef07ea..3f7d5bdc4 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.java @@ -45,4 +45,6 @@ public interface CommonPolicyDao { public void deleteCfgBatch(@Param("tableName")String tableName, @Param("entity")BaseCfg entity, @Param("compileIds")List compileIds); + + public void clearPolicies(@Param("tableName")String tableName); } 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 c1536b682..7ef05c720 100644 --- a/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml @@ -1042,4 +1042,10 @@ + + UPDATE ${tableName} + SET is_valid = -1, is_audit = 0 + WHERE is_valid != -1 + + \ 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 beb0625d5..d016de0b6 100644 --- a/src/main/java/com/nis/web/service/SystemService.java +++ b/src/main/java/com/nis/web/service/SystemService.java @@ -1,31 +1,17 @@ package com.nis.web.service; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStreamReader; import java.util.Collection; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; -import javax.xml.namespace.QName; - import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMNamespace; import org.apache.axiom.om.impl.OMNamespaceImpl; -import org.apache.axis2.AxisFault; -import org.apache.axis2.addressing.EndpointReference; -import org.apache.axis2.client.Options; -import org.apache.axis2.client.ServiceClient; -import org.apache.axis2.rpc.client.RPCServiceClient; import org.apache.commons.io.FileUtils; -import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.session.Session; import org.crazycake.shiro.exception.SerializationException; import org.crazycake.shiro.serializer.ObjectSerializer; @@ -41,19 +27,16 @@ import com.nis.util.Configurations; import com.nis.util.DateUtils; import com.nis.util.IpUtil; import com.nis.util.ServiceConfigTemplateUtil; -import com.nis.util.StringUtil; import com.nis.util.TimeConstants; import com.nis.web.dao.SrcIpDao; import com.nis.web.dao.SysOfficeDao; import com.nis.web.dao.UserDao; +import com.nis.web.dao.configuration.CommonPolicyDao; import com.nis.web.security.CacheSessionDAO; import com.nis.web.security.Servlets; -import com.nis.web.security.SessionDAO; import com.nis.web.security.UserUtils; import com.nis.web.service.basics.AsnGroupInfoService; -import antlr.StringUtils; - @Service public class SystemService extends BaseService{ @@ -70,6 +53,9 @@ public class SystemService extends BaseService{ @Autowired private AsnGroupInfoService asnGroupInfoService; + @Autowired + private CommonPolicyDao commonPolicyDao; + @Autowired private SrcIpDao srcIpDao; private RedisSerializer keySerializer = new StringSerializer(); @@ -193,7 +179,7 @@ public class SystemService extends BaseService{ Set tableNameSet = ServiceConfigTemplateUtil.getAllTableName(); tableNameSet.add("pxy_obj_spoofing_ip_pool"); for (String tableName : tableNameSet) { - sysOfficeDao.clearPolicies(tableName); + commonPolicyDao.clearPolicies(tableName); } // 初始化分组 asnGroupInfoService.reLoadGroupInfo();