From 1ccb709f723a759597dcdc7239d8885cef84d3ce Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 十二月 2024 17:56:19 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index a318547..25c5761 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -4,16 +4,19 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.common.utils.http.HttpUtils;
import org.apache.commons.lang3.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import com.smartor.service.IServiceTaskService;
import org.springframework.transaction.annotation.Transactional;
@@ -147,41 +150,46 @@
}
@Override
- public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+ public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish) {
Map<String, Object> map = new HashMap<>();
ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
serviceSubtaskVO.setPatid(patid);
serviceSubtaskVO.setTaskid(taskid);
- List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
- //鏌ヨ鎮ｈ�呮槸鍚﹂噸瑕嗗仛棰�
- if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
- Long submit = selectServiceSubtaskList.get(0).getSubmit();
- if (submit == 1L) {
- map.put("submit", "1");
- return map;
- }
- }
+// List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+// //鏌ヨ鎮ｈ�呮槸鍚﹂噸瑕嗗仛棰�
+// if (CollectionUtils.isEmpty(selectServiceSubtaskList)) {
+// Long submit = selectServiceSubtaskList.get(0).getSubmit();
+// if (submit == 1L) {
+// map.put("submit", "1");
+// return map;
+// }
+// }
//閫氳繃浠诲姟ID鑾峰彇妯℃澘ID
ServiceTask serviceTask = selectServiceTaskByTaskid(taskid);
List info = new ArrayList();
if (serviceTask.getType().equals("1")) {
//闅忚
+ log.error("鏂囨湰闅忚闂");
info = sfInfo(serviceTask, patid);
} else if (serviceTask.getType().equals("2")) {
//闂嵎
- info = wjInfo(serviceTask, patid);
+ log.error("鏂囨湰闂嵎闂");
+ info = wjInfo(serviceTask, patid, isFinish);
} else {
//瀹ｆ暀
- info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
+ info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid, isFinish);
}
//鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
- ServiceSubtask ServiceTaskSingle = new ServiceSubtask();
- ServiceTaskSingle.setTaskid(taskid);
- ServiceTaskSingle.setPatid(patid);
- ServiceTaskSingle.setResult("success");
- ServiceTaskSingle.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(ServiceTaskSingle);
+ if (isFinish) {
+ ServiceSubtask ss = new ServiceSubtask();
+ ss.setTaskid(taskid);
+ ss.setPatid(patid);
+ ss.setSendstate(1L);
+ ss.setResult("success");
+ ss.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
+ }
SvyTaskTemplate svyTaskTemplate = svyTaskTemplateMapper.selectSvyTaskTemplateBySvyid(serviceTask.getTemplateid());
if (StringUtils.isNotEmpty(serviceTask.getKcb())) map.put("kcb", serviceTask.getKcb());
map.put("script", info);
@@ -262,14 +270,15 @@
* @param patid
* @return
*/
- private List wjInfo(ServiceTask serviceTask, Long patid) {
+ private List wjInfo(ServiceTask serviceTask, Long patid, Boolean isFinish) {
//鐢ㄦ埛鐐瑰嚮浜嗗閾撅紝灏辩畻浠栭鍙栦簡
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setSendstate(1L);
- serviceSubtask.setPatid(patid);
- serviceSubtask.setTaskid(serviceTask.getTaskid());
- serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
-
+ if (isFinish == true) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setSendstate(1L);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setTaskid(serviceTask.getTaskid());
+ serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
+ }
//閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
@@ -325,13 +334,15 @@
return svyLibTemplateScriptVOS;
}
- private List xjInfo(Long templateId, Long taskid, Long patid) {
- ServiceSubtask serviceSubtask = new ServiceSubtask();
- serviceSubtask.setTaskid(taskid);
- serviceSubtask.setPatid(patid);
- serviceSubtask.setResult("瀹屾垚");
- serviceSubtask.setFinishtime(new Date());
- serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
+ if (isFinish == true) {
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(taskid);
+ serviceSubtask.setPatid(patid);
+ serviceSubtask.setResult("瀹屾垚");
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ }
HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
List list = new ArrayList();
list.add(heLibrary);
--
Gitblit v1.9.3