diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java index d6bec9bc9..921c5b385 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.java @@ -18,6 +18,6 @@ public interface PxyObjSpoofingIpPoolDao extends CrudDao{ PxyObjSpoofingIpPool getPxyObjSpoofingIpPool(Long cfgId); int insert(PxyObjSpoofingIpPool spoofingPool); int update(PxyObjSpoofingIpPool spoofingPool); - int updateState(@Param("tableName")String tableName,@Param("compileId")int compileId,@Param("isValid")Integer isValid,@Param("editorId")Long editorId); + int updateState(@Param("tableName")String tableName,@Param("compileId")String compileId,@Param("isValid")Integer isValid); List findByPage(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index 7507fd095..5fa427f5f 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -309,14 +309,12 @@ - update ${tableName} - - is_valid = #{isValid} , - is_audit = 1, - editor_id = #{editorId}, - edit_time=now(), - - where compile_id = #{compileId} + UPDATE ${tableName} SET + is_valid = #{isValid,jdbcType=INTEGER}, + audit_time = now() + + AND cfg_id =#{compileId} + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/ScheduleService.java b/src/main/java/com/nis/web/service/ScheduleService.java index 12d4c1a71..08c07b17c 100644 --- a/src/main/java/com/nis/web/service/ScheduleService.java +++ b/src/main/java/com/nis/web/service/ScheduleService.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import com.nis.domain.ScheduleCfg; import com.nis.domain.ScheduleExceInfo; import com.nis.domain.configuration.BaseCfg; +import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.PxyObjSpoofingIpPool; import com.nis.util.SchedulerTaskUtil; import com.nis.util.ServiceConfigTemplateUtil; @@ -58,13 +59,6 @@ public class ScheduleService extends BaseService{ if(isValid == 0) { isIssueContent=0; } - if(cfg.getServiceId().equals(518)){ - try{ - pxyObjSpoofingIpPoolDao.updateState("pxy_obj_spoofing_ip_pool",compileId-1,isValid,UserUtils.getUser().getId()); - }catch(Exception e){ - logger.info("更新 pxy_obj_spoofing_ip_pool 异常",e); - } - } ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil(); List> serviceList = serviceTemplate.getServiceListByServiceId(cfg.getServiceId()); //根据编译ID查询配置表中的配置信息 @@ -75,8 +69,13 @@ public class ScheduleService extends BaseService{ if(cfgList!=null){ for(Map m:cfgList){ String regionTable = m.get("tableName").toString(); - //更新配置域表的isValid字段 - dao.updateCfgTableStatus(regionTable, compileId, isValid); + if(regionTable.equals("pxy_obj_spoofing_ip_pool")){ // IP_Spoofing + //更新配置域表的isValid字段 + pxyObjSpoofingIpPoolDao.updateState(regionTable, baseCfg.getUserRegion3(), isValid); + }else{ + //更新配置域表的isValid字段 + dao.updateCfgTableStatus(regionTable, compileId, isValid); + } } } } diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index 4a5f8726d..9fcae125f 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -230,6 +230,8 @@ public class InterceptCfgService extends CrudService spoofingPool.setIsAreaEffective(0); spoofingPool.setEditTime(new Date()); spoofingPool.setEditorId(UserUtils.getUser().getId()); + spoofingPool.setIsValid(0); + spoofingPool.setIsAudit(0); pxyObjSpoofingIpPoolDao.update(spoofingPool);//保存仿冒IP池配置 }