From 0b02577ab12ac83a0530b7e0495b513dd0cdabca Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 02 七月 2024 11:25:08 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
index 34d0dc1..0067dc4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/CommonTaskServiceImpl.java
@@ -9,7 +9,7 @@
 import com.ruoyi.common.utils.DtoConversionUtils;
 import com.smartor.domain.*;
 import com.smartor.service.CommonTaskService;
-import com.smartor.service.IIvrTaskService;
+import com.smartor.service.IServiceTaskService;
 import com.smartor.service.ISvyTaskService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -33,7 +33,7 @@
 @Service
 public class CommonTaskServiceImpl implements CommonTaskService {
     @Autowired
-    private IIvrTaskService ivrTaskService;
+    private IServiceTaskService ivrTaskService;
 
     @Autowired
     private ISvyTaskService iSvyTaskService;
@@ -60,14 +60,14 @@
     }
 
     public int sfSend(SendTaskVO sendTaskVO) {
-        IvrTask ivrTask = ivrTaskService.selectIvrTaskByTaskid(sendTaskVO.getTaskId());
+        ServiceTask ivrTask = ivrTaskService.selectServiceTaskByTaskid(sendTaskVO.getTaskId());
         if (sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 3 || sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 4) {
             //浠诲姟鏆傚仠鎴栫粓姝�
-            IvrTask ivrTask3 = new IvrTask();
-            ivrTask3.setTaskid(sendTaskVO.getTaskId());
-            ivrTask3.setStopState(ivrTask.getStopState() + 1);
-            ivrTask3.setSendState(sendTaskVO.getSendState());
-            ivrTaskService.updateIvrTask(ivrTask3);
+            ServiceTask serviceTask = new ServiceTask();
+            serviceTask.setTaskid(sendTaskVO.getTaskId());
+            serviceTask.setStopState(ivrTask.getStopState() + 1);
+            serviceTask.setSendState(sendTaskVO.getSendState());
+            ivrTaskService.updateServiceTask(serviceTask);
             return 0;
         }
 
@@ -82,10 +82,10 @@
             redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
 
             //灏嗕换鍔$姸鎬佷慨鏀规垚鎵ц涓�
-            IvrTask ivrTask2 = new IvrTask();
-            ivrTask2.setTaskid(ivrTask.getTaskid());
-            ivrTask2.setSendState(2);
-            ivrTaskService.updateIvrTask(ivrTask2);
+            ServiceTask serviceTask = new ServiceTask();
+            serviceTask.setTaskid(ivrTask.getTaskid());
+            serviceTask.setSendState(2);
+            ivrTaskService.updateServiceTask(serviceTask);
         } else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
             //鏃堕棿娈靛彂閫�
             ObjectMapper objectMapper = new ObjectMapper();
@@ -121,10 +121,10 @@
                     redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
                 }
                 //灏嗕换鍔$姸鎬佷慨鏀规垚鎵ц涓�
-                IvrTask ivrTask2 = new IvrTask();
-                ivrTask2.setTaskid(ivrTask.getTaskid());
-                ivrTask2.setSendState(2);
-                ivrTaskService.updateIvrTask(ivrTask2);
+                ServiceTask serviceTask = new ServiceTask();
+                serviceTask.setTaskid(ivrTask.getTaskid());
+                serviceTask.setSendState(2);
+                ivrTaskService.updateServiceTask(serviceTask);
             }
         }
         return 1;
@@ -134,11 +134,11 @@
         SvyTask svyTask = iSvyTaskService.selectSvyTaskByTaskid(sendTaskVO.getTaskId());
         if (sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 3 || sendTaskVO.getSendState() != null && sendTaskVO.getSendState() == 4) {
             //浠诲姟鏆傚仠鎴栫粓姝�
-            SvyTask svyTask1 = new SvyTask();
-            svyTask1.setTaskid(sendTaskVO.getTaskId());
-            svyTask1.setStopState(svyTask.getStopState() + 1);
-            svyTask1.setSendState(sendTaskVO.getSendState().toString());
-            iSvyTaskService.updateSvyTask(svyTask1);
+            SvyTask serviceTask = new SvyTask();
+            serviceTask.setTaskid(sendTaskVO.getTaskId());
+            serviceTask.setStopState(svyTask.getStopState() + 1);
+            serviceTask.setSendState(sendTaskVO.getSendState().toString());
+            iSvyTaskService.updateSvyTask(serviceTask);
             return 0;
         }
 
@@ -154,10 +154,10 @@
             redisCache.setCacheObject(content, content, 1, TimeUnit.SECONDS);
 
             //灏嗕换鍔$姸鎬佷慨鏀规垚鎵ц涓�
-            SvyTask svyTask2 = new SvyTask();
-            svyTask2.setTaskid(svyTask.getTaskid());
-            svyTask2.setSendState("2");
-            iSvyTaskService.updateSvyTask(svyTask2);
+            SvyTask serviceTask = new SvyTask();
+            serviceTask.setTaskid(svyTask.getTaskid());
+            serviceTask.setSendState("2");
+            iSvyTaskService.updateSvyTask(serviceTask);
         } else if (StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("1") || StringUtils.isNotEmpty(sendTaskVO.getSendType()) && sendTaskVO.getSendType().equals("3")) {
             //鏃堕棿娈靛彂閫�
             ObjectMapper objectMapper = new ObjectMapper();
@@ -193,10 +193,10 @@
                     redisCache.setCacheObject(content, content, milliseconds / 1000, TimeUnit.SECONDS);
                 }
                 //灏嗕换鍔$姸鎬佷慨鏀规垚鎵ц涓�
-                SvyTask svyTask3 = new SvyTask();
-                svyTask3.setTaskid(svyTask.getTaskid());
-                svyTask3.setSendState("2");
-                iSvyTaskService.updateSvyTask(svyTask3);
+                SvyTask serviceTask = new SvyTask();
+                serviceTask.setTaskid(svyTask.getTaskid());
+                serviceTask.setSendState("2");
+                iSvyTaskService.updateSvyTask(serviceTask);
             }
         }
         return 1;

--
Gitblit v1.9.3