From ad53e4af4e4e238453d7613530b501540df915e1 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 10 十一月 2025 19:12:24 +0800
Subject: [PATCH] 长期任务，BUG处理
---
smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java | 88 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 13 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 3ccc455..ea78762 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -69,7 +69,7 @@
@Autowired
- private IvrLibaTemplateTargetoptionMapper ivrLibaTemplateTargetOptionMapper;
+ private SvyLibTemplateTargetoptionMapper svyLibTemplateTargetoptionMapper;
@Autowired
private IvrTaskTemplateTargetoptionMapper ivrTaskTemplateTargetOptionMapper;
@@ -263,9 +263,10 @@
ServiceSubtask ss = new ServiceSubtask();
ss.setTaskid(taskid);
ss.setPatid(patid);
- Integer integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
- if (integer != null && integer != 6) {
- ss.setSendstate(1L);
+ ss.setSendstate(3L);
+ List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(ss);
+ if (integer != null) {
+ ss.setSendstate(6L);
serviceSubtaskMapper.updateServiceSubtaskByCondition(ss);
}
}
@@ -480,8 +481,11 @@
svyTaskTemplateScript.setDelFlag("0");
List<SvyTaskTemplateScript> svyTaskTemplateScripts = svyTaskTemplateScriptMapper.selectSvyTaskTemplateScriptList(svyTaskTemplateScript);
if (CollectionUtils.isEmpty(svyTaskTemplateScripts) || svyTaskTemplateScripts.size() == 0) {
- log.info("svyTaskTemplateScripts涓虹┖浜嗭紝璇峰敖蹇仈绯荤鐞嗗憳澶勭悊");
- return new ArrayList<>();
+ insertSvyTaskTempScript(null, serviceTask);
+ svyTaskTemplateScripts = svyTaskTemplateScriptMapper.selectSvyTaskTemplateScriptList(svyTaskTemplateScript);
+ if (CollectionUtils.isEmpty(svyTaskTemplateScripts)) {
+ throw new BaseException("璇疯仈绯荤鐞嗗憳锛屾鏌ラ棶棰樻ā鏉夸俊鎭�!");
+ }
}
List<SvyTaskTemplateScriptVO> svyTaskTemplateScriptVOS = DtoConversionUtils.sourceToTarget(svyTaskTemplateScripts, SvyTaskTemplateScriptVO.class);
@@ -504,16 +508,16 @@
}
List<Map<String, String>> mapList = new ArrayList<>();
- for (Map<String, String> map : ivrTaskMap.values()) {
- mapList.add(map);
+ if (ivrTaskMap != null) {
+ for (Map<String, String> map : ivrTaskMap.values()) {
+ mapList.add(map);
+ }
}
-
//灏嗘ā鏉块棶棰樿瘽鏈噷鐨勯�氶厤绗︽浛鎹�
for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {
for (Map<String, String> map : mapList) {
for (String key : map.keySet()) {
-
svyTaskTemplateScriptVO.setScriptContent(svyTaskTemplateScriptVO.getScriptContent().replace(key, StringUtils.isNotEmpty(map.get(key)) ? map.get(key) : ""));
}
}
@@ -532,11 +536,68 @@
if (svyTaskTemplateTargetoption.getNodynamiccruxs().size() == 0)
svyTaskTemplateTargetoption.setNodynamiccruxs(null);
List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateTargetoptionMapper.selectSvyTaskTemplateTargetoptionList(svyTaskTemplateTargetoption);
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ if (CollectionUtils.isNotEmpty(svyTaskTemplateTargetoptions)) {
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ } else {
+ //濡傛灉閫夐」娌℃湁鏌ュ埌锛岄渶瑕佸幓鍩虹妯℃澘搴撳皢閫夐」鏌ヨ鍑烘潵锛屾斁鍒颁换鍔℃ā鏉块�夐」搴撲腑
+ insertSvyTaskTempScript(svyTaskTemplateScriptVO, serviceTask);
+
+ }
}
}
Collections.sort(svyTaskTemplateScriptVOS, Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
return svyTaskTemplateScriptVOS;
+ }
+
+
+ private void insertSvyTaskTempScript(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, ServiceTask serviceTask) {
+ log.info("-------鍩虹妯℃澘libtemplateid鐨勫�间负锛歿}", serviceTask.getLibtemplateid());
+ if (StringUtils.isEmpty(serviceTask.getLibtemplateid())) {
+ return;
+ }
+
+ SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
+ svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
+ List<SvyLibTemplateScript> svyLibTemplateScripts = svyLibTemplateScriptMapper.selectSvyLibTemplateScriptList(svyLibTemplateScript);
+ log.info("-------鍩虹妯℃澘svyLibTemplateScripts闂鍊间负锛歿}", svyLibTemplateScripts.size());
+ for (SvyLibTemplateScript sll : svyLibTemplateScripts) {
+ if (ObjectUtils.isNotEmpty(svyTaskTemplateScriptVO)) {
+ if (sll.getScriptContent().trim().equals(svyTaskTemplateScriptVO.getScriptContent().trim())) {
+ SvyLibTemplateTargetoption sltto = new SvyLibTemplateTargetoption();
+ sltto.setScriptid(sll.getId());
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(sltto);
+
+ //灏嗘煡鍑烘潵鐨勯�夐」锛屾斁鍒皊vyTaskTemplateTargetoption涓�
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptionList = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
+ for (int i = 0; i < svyTaskTemplateTargetoptionList.size(); i++) {
+ svyTaskTemplateTargetoptionList.get(i).setTemplateID(svyTaskTemplateScriptVO.getTemplateID());
+ svyTaskTemplateTargetoptionList.get(i).setScriptid(svyTaskTemplateScriptVO.getId());
+ svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoptionList.get(i));
+ log.info("-------鏂板瀹屼箣鍚庣殑閫夐」ID鍊间负锛歿}", svyTaskTemplateTargetoptionList.get(i).getId());
+ }
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptionList);
+ }
+ } else {
+ //鏂板闂
+ SvyTaskTemplateScript stts = DtoConversionUtils.sourceToTarget(sll, SvyTaskTemplateScript.class);
+ stts.setId(null);
+ stts.setTaskid(serviceTask.getTaskid());
+ stts.setTemplateID(serviceTask.getTemplateid());
+ svyTaskTemplateScriptMapper.insertSvyTaskTemplateScript(stts);
+
+ //鏂板闂閫夐」
+ SvyLibTemplateTargetoption sltto = new SvyLibTemplateTargetoption();
+ sltto.setScriptid(sll.getId());
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = svyLibTemplateTargetoptionMapper.selectSvyLibTemplateTargetoptionList(sltto);
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptionList = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
+ for (int i = 0; i < svyTaskTemplateTargetoptionList.size(); i++) {
+ svyTaskTemplateTargetoptionList.get(i).setTemplateID(serviceTask.getTemplateid());
+ svyTaskTemplateTargetoptionList.get(i).setScriptid(stts.getId());
+ svyTaskTemplateTargetoptionMapper.insertSvyTaskTemplateTargetoption(svyTaskTemplateTargetoptionList.get(i));
+ }
+
+ }
+ }
}
private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
@@ -544,8 +605,9 @@
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setTaskid(taskid);
serviceSubtask.setPatid(patid);
- Integer integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
- if (integer == 3) {
+ serviceSubtask.setSendstate(3L);
+ List<Integer> integer = serviceSubtaskMapper.selectSendstateByCondition(serviceSubtask);
+ if (integer != null) {
serviceSubtask.setResult("瀹屾垚");
serviceSubtask.setFinishtime(new Date());
serviceSubtask.setSendstate(6L);
--
Gitblit v1.9.3