From 1cff3842cca26d770bdba4f8fd2143742342b093 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 七月 2024 17:40:12 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index bf0c347..908e483 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -117,11 +117,14 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+
allKeys = new HashSet<>();
if (serviceSubTaskAnswerReq.getType() == 1) {
- allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-SFscriptCache"));
+// allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-SFscriptCache"));
+ allKeys.add(pid + "-" + tid + "-SFscriptCache");
} else if (serviceSubTaskAnswerReq.getType() == 2) {
- allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-WJscriptCache"));
+// allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-WJscriptCache"));
+ allKeys.add(pid + "-" + tid + "-WJscriptCache");
}
}
@@ -130,7 +133,7 @@
String[] split = key.split("-");
if (key.contains("-SFscriptCache")) {
//鍖呭惈浜�,璇存槑浜嗘槸闅忚闂
- List<IvrLibaTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+ List<IvrLibaTemplateScriptVO> cacheList = redisCache.getCacheObject(key);
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
// 璇存槑鏄涓�棰�
@@ -199,7 +202,7 @@
private void setSFInfo(IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO, Long taskid, Long patid) {
ServiceSubtaskAnswer serviceSubtaskAnswer = null;
String dx = "";
- if (ivrLibaTemplateScriptVO.getScriptType().equals("1") || ivrLibaTemplateScriptVO.getScriptType().equals("2")) {
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptType()) && ivrLibaTemplateScriptVO.getScriptType().equals("1") || StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptType()) && ivrLibaTemplateScriptVO.getScriptType().equals("2")) {
//1銆�2涓哄崟閫夋垨澶氶��
for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption : ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList()) {
//鑾峰彇鐢ㄦ埛閫変腑鐨勯�夐」鍙�
@@ -211,8 +214,8 @@
dx = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(0).getAppenddesc();
}
}
- serviceSubtaskAnswer.setTaskid(Long.valueOf(taskid));
- serviceSubtaskAnswer.setPatId(Long.valueOf(patid));
+ serviceSubtaskAnswer.setTaskid(taskid);
+ serviceSubtaskAnswer.setPatId(patid);
serviceSubtaskAnswer.setScriptid(ivrLibaTemplateScriptVO.getId());
serviceSubtaskAnswer.setScriptType(Long.valueOf(ivrLibaTemplateScriptVO.getScriptType()));
serviceSubtaskAnswer.setAnswer(dx.substring(1));
--
Gitblit v1.9.3