From 0ff7a8f69570b3fc7418c35f3d6e273ef4f73f20 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 26 七月 2024 10:35:10 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 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 5333257..ae06130 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -1,6 +1,10 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
@@ -116,8 +120,11 @@
if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
//闇�瑕佺珛鍗虫墽琛�
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
- Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+// Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
+// Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+
+ Long tid=Long.valueOf(serviceSubTaskAnswerReq.getParam1());
+ Long pid=Long.valueOf(serviceSubTaskAnswerReq.getParam2());
allKeys = new HashSet<>();
if (serviceSubTaskAnswerReq.getType() == 1) {
@@ -185,8 +192,10 @@
@Override
public Integer saveQuestionCache(ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
- Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+// Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
+// Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
+ Long tid=Long.valueOf(serviceSubTaskCacheReq.getParam1());
+ Long pid=Long.valueOf(serviceSubTaskCacheReq.getParam2());
if (CollectionUtils.isNotEmpty(serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList())) {
//闅忚
redisCache.setCacheObject(pid + "-" + tid + "-SFscriptCache", serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList());
@@ -205,12 +214,20 @@
serviceSubtaskAnswer.setPatId(serviceSubTaskQueryReq.getPatId());
serviceSubtaskAnswer.setScriptid(serviceSubTaskQueryReq.getScriptid());
List<ServiceSubtaskAnswer> serviceSubtaskAnswerList = serviceSubtaskAnswerMapper.selectServiceSubtaskAnswerList(serviceSubtaskAnswer);
+ for (ServiceSubtaskAnswer serviceSubtaskAnswer1 : serviceSubtaskAnswerList) {
+ ObjectMapper mapper = new ObjectMapper();
+ try {
+ List<ServiceSubtaskOptionAnswer> serviceSubtaskOptionAnswer = mapper.readValue(serviceSubtaskAnswer1.getAnswer(), List.class);
+ serviceSubtaskAnswer1.setOptionAnswer(serviceSubtaskOptionAnswer);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ }
+ }
return serviceSubtaskAnswerList;
}
-
private void setSFInfo(IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO, Long taskid, Long patid) {
- ServiceSubtaskAnswer serviceSubtaskAnswer = null;
+ ServiceSubtaskAnswer serviceSubtaskAnswer = new ServiceSubtaskAnswer();
List<ServiceSubtaskOptionAnswer> answerList = new ArrayList<>();
if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("1") || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("2")) {
//1銆�2涓哄崟閫夋垨澶氶��
@@ -225,22 +242,8 @@
answerList.add(serviceSubtaskOptionAnswer);
}
}
- } else if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getScriptType()) && ivrTaskTemplateScriptVO.getScriptType().equals("4")) {
- //濉┖
- for (IvrTaskTemplateTargetoption ivrTaskTemplateTargetoption : ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList()) {
- log.error("ivrTaskTemplateTargetoption鐨勫�间负锛歿}", ivrTaskTemplateTargetoption);
- String[] split = ivrTaskTemplateTargetoption.getTargetvalue().split("|");
- for (String s : split) {
- ServiceSubtaskOptionAnswer serviceSubtaskOptionAnswer = new ServiceSubtaskOptionAnswer();
- serviceSubtaskOptionAnswer.setId(ivrTaskTemplateTargetoption.getId());
- serviceSubtaskOptionAnswer.setCode(ivrTaskTemplateTargetoption.getOptionCode());
- serviceSubtaskOptionAnswer.setValue(s);
- serviceSubtaskOptionAnswer.setAppenddesc(ivrTaskTemplateTargetoption.getAppenddesc());
- answerList.add(serviceSubtaskOptionAnswer);
- }
- }
} else {
- //闈炲崟澶氶�夛紙闂瓟锛�
+ //闈炲崟澶氶��
if (CollectionUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList())) {
log.error("IvrTaskScriptTargetoptionList鐨勫�间负锛歿}", ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList());
ServiceSubtaskOptionAnswer serviceSubtaskOptionAnswer = new ServiceSubtaskOptionAnswer();
--
Gitblit v1.9.3