From 856166612a33b3d876592c01ed9e6e54c64cbeaa Mon Sep 17 00:00:00 2001
From: xjs <1294405880@qq.com>
Date: Mon, 21 Feb 2022 20:34:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BD=9336=E5=A3=81=E7=BA=B8?=
 =?UTF-8?q?=E7=88=AC=E8=99=AB=E6=AD=A3=E5=9C=A8=E6=89=A7=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=202=E3=80=8136=E5=A3=81=E7=BA=B8=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9D=83=E9=99=90=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/warning/apiwarning/index.vue     |  1 +
 .../business/warning/apiwarninginfo/index.vue |  1 +
 .../mapper/apiwarning/ApiRecordMapper.xml     |  2 +-
 .../service/impl/_36wallpaperServiceImpl.java | 18 ++++++++++----
 .../impl/CopyWritingNetworkServiceImpl.java   | 24 +++++++++++++------
 5 files changed, 34 insertions(+), 12 deletions(-)

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">
           <el-option
             v-for="index in apiName"
diff --git a/ruoyi-ui/src/views/business/warning/apiwarninginfo/index.vue b/ruoyi-ui/src/views/business/warning/apiwarninginfo/index.vue
index 257aeb8b..e49a1ba4 100644
--- a/ruoyi-ui/src/views/business/warning/apiwarninginfo/index.vue
+++ b/ruoyi-ui/src/views/business/warning/apiwarninginfo/index.vue
@@ -7,6 +7,7 @@
           placeholder="请输入"
           clearable
           size="small"
+          @change="handleQuery"
           style="width: 180px">
           <el-option
             v-for="index in apiName"
diff --git a/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml b/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
index 5a4a0e80..0624ccb8 100644
--- a/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
+++ b/xjs-business/xjs-business-warning/src/main/resources/mapper/apiwarning/ApiRecordMapper.xml
@@ -26,7 +26,7 @@
         <include refid="selectApiRecordVo"/>
         <where>
             <if test="apiName != null  and apiName != ''"> and api_name like concat('%', #{apiName}, '%')</if>
-            <if test="status != null">status = #{status}</if>
+            <if test="status != null">and status = #{status}</if>
         </where>
         order by create_time desc
     </select>
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<CopyWritingNetwor
     @Override
     public List<CopyWritingNetwork> selectCopyWritingNetworkList(CopyWritingNetwork copyWritingNetwork) {
         List<CopyWritingNetwork> 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<CopyWritingNetwor
             char index0 = oldStr.charAt(0);
             char index1 = oldStr.charAt(1);
             char index2 = oldStr.charAt(2);
+            char index3 = oldStr.charAt(3);
             boolean matches0 = pattern.matcher(String.valueOf(index0)).matches();
             boolean matches1 = pattern.matcher(String.valueOf(index1)).matches();
+            boolean matches2 = pattern.matcher(String.valueOf(index2)).matches();
             //  1、
-            if (matches0 && index1=='、') {
-                return oldStr.substring(2,oldStr.length()-2);
+            if (matches0 && index1 == '、') {
+                return oldStr.substring(2);
             }
             // 15、
             if (matches0 && matches1 && index2 == '、') {
-                return oldStr.substring(3,oldStr.length()-3);
+                return oldStr.substring(3);
+            }
+            //100、
+            if (matches0 && matches1 && matches2 && index3 == '、') {
+                return oldStr.substring(4);
             }
             //1.
-            if (matches0 && index1=='.') {
-                return oldStr.substring(2,oldStr.length()-2);
+            if (matches0 && index1 == '.') {
+                return oldStr.substring(2);
             }
             //13.
             if (matches0 && matches1 && index2 == '.') {
-                return oldStr.substring(3,oldStr.length()-3);
+                return oldStr.substring(3);
+            }
+            //100.
+            if (matches0 && matches1 && matches2 && index3 == '.') {
+                return oldStr.substring(4);
             }
         } catch (Exception e) {
             log.error(e.getMessage());