diff --git a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue index c6fdb08d..8d72d99a 100644 --- a/ruoyi-ui/src/views/business/warning/apiwarning/index.vue +++ b/ruoyi-ui/src/views/business/warning/apiwarning/index.vue @@ -7,6 +7,7 @@ placeholder="请输入" clearable size="small" + @change="handleQuery" style="width: 180px"> and api_name like concat('%', #{apiName}, '%') - status = #{status} + and status = #{status} order by create_time desc diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java index fb25b1cf..cdc57bf9 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/_36wallpaper/service/impl/_36wallpaperServiceImpl.java @@ -75,10 +75,7 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36 @Override public boolean updateSettings(String json) { - //判断爬虫是否正在执行,正在执行不可修改! - if(redisService.hasKey(REPTILE_COUNT)){ - throw new BusinessException("爬虫正在执行中!暂时无法修改,请稍后再试"); - } + this.checkRunning(); //校验json格式是否正确 try { @@ -116,6 +113,8 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36 @Override public boolean resetSettings() { + this.checkRunning(); + //构建json JSONObject jsonObject = new JSONObject(); jsonObject.put("path",PATH); @@ -128,4 +127,15 @@ public class _36wallpaperServiceImpl extends ServiceImpl<_36wallpaperMapper, _36 } return false; } + + + /** + * 检测是否正在运行 + */ + private void checkRunning() { + //判断爬虫是否正在执行,正在执行不可修改! + if(redisService.hasKey(REPTILE_COUNT)){ + throw new BusinessException("爬虫正在执行中!暂时无法修改,请稍后再试"); + } + } } diff --git a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java index 02bc0606..3055b5d9 100644 --- a/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java +++ b/xjs-business/xjs-business-webmagic/src/main/java/com/xjs/copywritingNetwork/service/impl/CopyWritingNetworkServiceImpl.java @@ -40,7 +40,7 @@ public class CopyWritingNetworkServiceImpl extends ServiceImpl selectCopyWritingNetworkList(CopyWritingNetwork copyWritingNetwork) { List list = copyWritingNetworkMapper.selectCopyWritingNetworkList(copyWritingNetwork); - list.forEach(data ->{ + list.forEach(data -> { data.setContent(this.filterContent(data.getContent())); }); return list; @@ -67,23 +67,33 @@ public class CopyWritingNetworkServiceImpl extends ServiceImpl