From 380b95c9c8efb93419e21bd5e3b52b3c84cd0d81 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 07 三月 2025 16:53:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 72 insertions(+), 25 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index fcb5559..06b19cf 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -399,7 +399,13 @@
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setCreateTime(new Date());
log.error("----serviceTaskdiag鐨勫�间负锛歿}", serviceTaskdiag);
- serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ String[] Icd10codes = serviceTaskVO.getIcd10code().split(",");
+ for (String icd10code : Icd10codes) {
+ serviceTaskdiag.setIcd10code(icd10code);
+ serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ }
+ }
} else if (serviceTaskVO.getAppltype().equals("4")) {
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
@@ -407,12 +413,19 @@
serviceTaskoper.setTaskId(serviceTask.getTaskid());
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(0L);
- if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L);
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+ String[] opcodes = serviceTaskVO.getOpcode().split(",");
+ for (String opcode : opcodes) {
+ serviceTaskoper.setOpcode(opcode);
+ log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
+ }
+
} else {
ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
serviceTaskdept.setTaskId(serviceTask.getTaskid());
@@ -503,6 +516,7 @@
serviceTaskdept.setTaskId(serviceTask.getTaskid());
serviceTaskdept.setTaskName(serviceTask.getTaskName());
serviceTaskdept.setLongtask(0L);
+ serviceTaskdept.setOrgid(serviceTaskVO.getOrgid());
if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
@@ -546,42 +560,66 @@
if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
throw new BaseException("鐤剧梾缂栫爜涓虹┖");
}
- serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
- List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
+// serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code());
+
serviceTaskdiag.setLongtask(1L);
serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name());
serviceTaskdiag.setGuid(serviceTask.getGuid());
serviceTaskdiag.setOrgid(serviceTask.getOrgid());
serviceTaskdiag.setUpdateTime(new Date());
- log.error("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
- if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
- serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
- serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag);
- } else {
- serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) {
+ String[] icd10codes = serviceTaskVO.getIcd10code().split(",");
+ for (String icdcode : icd10codes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ ServiceTaskdiag serviceTaskdiag2 = new ServiceTaskdiag();
+ serviceTaskdiag2.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskdiag2.setIcd10code(icdcode);
+ List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag2);
+ serviceTaskdiag.setIcd10code(icdcode);
+ log.error("----serviceTaskdiag鏇存柊鐨勫�间负锛歿}", serviceTaskdiag);
+ if (CollectionUtils.isNotEmpty(serviceTaskdiags)) {
+ serviceTaskdiag.setId(serviceTaskdiags.get(0).getId());
+ serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag);
+ } else {
+ serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);
+ }
+ }
}
+
} else if (serviceTaskVO.getAppltype().equals("4")) {
ServiceTaskoper serviceTaskoper = new ServiceTaskoper();
if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) {
throw new BaseException("鎵嬫湳缂栫爜涓虹┖");
}
- serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
+// serviceTaskoper.setOpcode(serviceTaskVO.getOpcode());
serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc());
serviceTaskoper.setTaskId(serviceTask.getTaskid());
- List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
serviceTaskoper.setTaskName(serviceTask.getTaskName());
serviceTaskoper.setLongtask(1L);
serviceTaskoper.setGuid(serviceTask.getGuid());
serviceTaskoper.setOrgid(serviceTask.getOrgid());
serviceTaskoper.setCreateTime(new Date());
- log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
- if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
- serviceTaskoper.setId(serviceTaskopers.get(0).getId());
- serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
- } else {
- serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) {
+ String[] opcodes = serviceTaskVO.getOpcode().split(",");
+ for (String opcode : opcodes) {
+ //鍏堟煡璇竴涓嬫槸鍚﹀瓨鍦�
+ ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper();
+ serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid());
+ serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode());
+ List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2);
+
+ serviceTaskoper.setOpcode(opcode);
+ log.error("----serviceTaskoper鐨勫�间负锛歿}", serviceTaskoper);
+ if (CollectionUtils.isNotEmpty(serviceTaskopers)) {
+ serviceTaskoper.setId(serviceTaskopers.get(0).getId());
+ serviceTaskoperService.updateServiceTaskoper(serviceTaskoper);
+ } else {
+ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper);
+ }
+ }
}
+
}
if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
IvrTaskTemplate ivrTaskTemplate = new IvrTaskTemplate();
@@ -1044,6 +1082,8 @@
double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
serviceSubtask.setScore(BigDecimal.valueOf(score));
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("鍏堟洿鏂颁竴涓嬪垎鏁�,鐢佃瘽鐨剆erviceSubtask鐨勫�间负锛歿}", serviceSubtask);
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
Map<String, String> map = delRedisValue(null, id.toString());
if (ObjectUtils.isNotEmpty(map)) redisCache.setCacheObject(map.get("cacheName"), map.get("val"));
@@ -1569,7 +1609,7 @@
}
}
if (existList.size() != 0) redisCache.setCacheListRight("cache-exist", existList);
- log.error("-----------瀹為檯鎷夊彇鐨勭數璇濇暟鎹噺锛歿}", pullTaskVOList.size());
+ log.error("-----------瀹為檯鎷夊彇鐨勭數璇濇暟鎹噺锛歿}", CollectionUtils.isNotEmpty(pullTaskVOList) ? pullTaskVOList.size() : null);
return pullTaskVOList;
}
@@ -1608,7 +1648,10 @@
}
}
//濡傛灉ivrTaskTemplateScript涓虹┖锛屼篃灏辨病鏈夊線涓嬫墽琛岀殑蹇呰浜�
- if (ObjectUtils.isEmpty(ivrTaskTemplateScript)) return null;
+ if (ObjectUtils.isEmpty(ivrTaskTemplateScript)) {
+ log.error("---------杩欎釜ivrTaskTemplate.getId()鐨勯棶棰樹负绌猴細{}", ivrTaskTemplate.getId());
+ continue;
+ }
//鑾峰彇閫氶厤绗﹀尮閰嶈繃鍚庣殑闂
String scrContent = getObject(serviceSubtask, ivrTaskTemplateScript.getIvrtext());
String kcb = serviceTask.getKcb() + "," + scrContent;
@@ -1948,6 +1991,8 @@
serviceSubtask.setSendstate(6L);
serviceSubtask.setId(Long.valueOf(phoneCallRecordVO.getTaskid()));
serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("鐢佃瘽鎷ㄦ墦宸插畬鎴恠erviceSubtask鐨勫�间负:{}", serviceSubtask);
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
//涓嬭浇鏂囦欢
ftpService.downloadFolder("/" + LocalDate.now().toString(), profile + "/upload/vadio/voice/" + LocalDate.now().toString());
@@ -2066,12 +2111,12 @@
serviceSubtaskStatistic.setYczs(serviceSubtaskStatistic.getYczs() + 1L);
}
}
- //闅忚瀹屾垚鐜�=宸插彂閫�/闅忚鏁�
- if (serviceSubtaskStatistic.getYfsCount() == 0 || CollectionUtils.isEmpty(serviceSubtaskList)) {
+ //闅忚瀹屾垚鐜�=宸插畬鎴�/搴旈殢璁块噺
+ if (serviceSubtaskStatistic.getYwcCount() == 0 || CollectionUtils.isEmpty(serviceSubtaskList)) {
serviceSubtaskStatistic.setSfwcl("0");
} else {
// BigDecimal multiply = BigDecimal.valueOf(serviceSubtaskStatistic.getYfsCount()).divide(BigDecimal.valueOf(serviceSubtaskList.size()), 2, BigDecimal.ROUND_HALF_UP);
- BigDecimal multiply = new BigDecimal(serviceSubtaskStatistic.getYfsCount().toString()).divide(new BigDecimal(serviceSubtaskList.size() + ""), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal multiply = new BigDecimal(serviceSubtaskStatistic.getYwcCount().toString()).divide(new BigDecimal(serviceSubtaskStatistic.getYsfCount().toString()), 2, BigDecimal.ROUND_HALF_UP);
serviceSubtaskStatistic.setSfwcl(multiply.toString());
}
@@ -2139,10 +2184,12 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
serviceOutPath.setCreateTime(new Date());
+ serviceOutPath.setParam6(subId);
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
//杞垚16杩涘埗
String format = String.format("%03X", serviceOutPath.getId());
--
Gitblit v1.9.3