From 9526971c403417c1c007804f24884c443b9e6cd7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 04 九月 2024 00:34:40 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 220 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 163 insertions(+), 57 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 d090405..ef20484 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -9,8 +9,10 @@
import com.smartor.domain.*;
import com.smartor.mapper.ServiceSubtaskAnswerMapper;
import com.smartor.mapper.ServiceSubtaskDetailMapper;
+import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.SvyTaskTemplateTargetoptionMapper;
import com.smartor.service.IServiceSubtaskAnswerService;
+import com.smartor.service.IServiceTaskService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -18,7 +20,9 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.concurrent.TimeUnit;
/**
* 浠诲姟闂嵎闂閫夐」Service涓氬姟灞傚鐞�
@@ -33,10 +37,16 @@
private ServiceSubtaskAnswerMapper serviceSubtaskAnswerMapper;
@Autowired
+ private ServiceSubtaskMapper serviceSubtaskMapper;
+
+ @Autowired
private RedisCache redisCache;
@Autowired
private ServiceSubtaskDetailMapper serviceSubtaskDetailMapper;
+
+ @Autowired
+ private IServiceTaskService serviceTaskService;
@Autowired
private SvyTaskTemplateTargetoptionMapper svyTaskTemplateTargetoptionMapper;
@@ -114,12 +124,15 @@
@Override
public Integer saveQuestionAnswer(ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
+ Long tid = null;
+ Long pid = null;
+ Double score = null;
Set<String> allKeys = redisCache.getAllKeys();
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));
+ tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
+ pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
allKeys = new HashSet<>();
allKeys.add(pid + "-" + tid + "-WJscriptCache");
}
@@ -128,26 +141,53 @@
for (String key : allKeys) {
String[] split = key.split("-");
if (key.contains("-WJscriptCache")) {
- List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+ List<SvyLibTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
- // 璇存槑鏄涓�棰�
- //灏嗙涓�棰樼殑淇℃伅鏀惧埌琛ㄤ腑
- nextScriptno = setWJInfo(cacheList.get(0), Long.valueOf(split[1]), Long.valueOf(split[0]));
- } else {
- for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
- if (svyTaskTemplateScriptVO.getId() == nextScriptno) {
- //灏嗙涓�棰樼殑淇℃伅鏀惧埌琛ㄤ腑
- setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
- nextScriptno = Long.valueOf(cacheList.get(0).getNextScriptno());
+ //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
+ for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : cacheList) {
+ if (svyLibTemplateScriptVO.getSort() == 1) {
+ //璇存槑鏄涓�棰�
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(0), SvyTaskTemplateScriptVO.class);
+ List<SvyLibTemplateTargetoption> svyLibTemplateTargetoptions = cacheList.get(0).getSvyLibTemplateTargetoptions();
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(svyLibTemplateTargetoptions, SvyTaskTemplateTargetoption.class);
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid);
+ nextScriptno = Long.valueOf(map.get("nextScriptNo"));
+ if (score == null) {
+ score = Double.valueOf(map.get("score"));
+ } else {
+ score = score + Double.valueOf(map.get("score"));
+ }
}
+ }
+ } else {
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), SvyTaskTemplateScriptVO.class);
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getSvyLibTemplateTargetoptions(), SvyTaskTemplateTargetoption.class);
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+
+ if (svyTaskTemplateScriptVO.getSort() == nextScriptno) {
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]));
+ nextScriptno = Long.valueOf(map.get("nextScriptNo"));
+ if (score == null) {
+ score = Double.valueOf(map.get("score"));
+ } else {
+ score = score + Double.valueOf(map.get("score"));
+ }
}
}
}
}
//灏嗚key鍜寁alue浠巖edis涓紝鍒犻櫎
redisCache.deleteObject(key);
+ ServiceSubtask serviceSubtask = new ServiceSubtask();
+ serviceSubtask.setTaskid(tid);
+ serviceSubtask.setPatid(pid);
+ serviceSubtask.setFinishtime(new Date());
+ if (score != null) serviceSubtask.setScore(BigDecimal.valueOf(score));
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
}
return 1;
}
@@ -164,35 +204,80 @@
Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam1(), pri_key));
Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskCacheReq.getParam2(), pri_key));
//闂嵎
- redisCache.setCacheObject(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyTaskTemplateScriptVOList());
+ redisCache.deleteObject(pid + "-" + tid + "-WJscriptCache");
+ redisCache.setCacheList(pid + "-" + tid + "-WJscriptCache", serviceSubTaskCacheReq.getSvyLibTemplateScriptVOS());
+ //璁剧疆杩囨湡鏃堕棿 3澶�
+ Long tims = Long.valueOf(3 * 24 * 3600);
+ redisCache.expire(pid + "-" + tid + "-WJscriptCache", tims);
return 1;
}
@Override
- public List<ServiceSubtaskDetailVO> selectPatQuestionResult(ServiceSubTaskQueryReq serviceSubTaskQueryReq) {
- log.error("selectPatQuesTionResult鐨勫叆鍙備负锛歿}", serviceSubTaskQueryReq);
- List<ServiceSubtaskDetailVO> serviceSubtaskDetailVOList = new ArrayList<>();
- ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
- serviceSubtaskDetail.setTaskid(serviceSubTaskQueryReq.getTaskid());
- serviceSubtaskDetail.setPatid(serviceSubTaskQueryReq.getPatId());
- serviceSubtaskDetail.setScriptid(serviceSubTaskQueryReq.getScriptid());
- List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
- for (ServiceSubtaskDetail serviceSubtaskDetail1 : serviceSubtaskDetails) {
- ServiceSubtaskDetailVO serviceSubtaskDetailVO = DtoConversionUtils.sourceToTarget(serviceSubtaskDetail1, ServiceSubtaskDetailVO.class);
- SvyTaskTemplateTargetoption svyTaskTemplateTargetoption = new SvyTaskTemplateTargetoption();
- svyTaskTemplateTargetoption.setScriptid(serviceSubtaskDetailVO.getScriptid());
- svyTaskTemplateTargetoption.setTaskid(serviceSubtaskDetailVO.getTaskid());
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = svyTaskTemplateTargetoptionMapper.selectSvyTaskTemplateTargetoptionList(svyTaskTemplateTargetoption);
- serviceSubtaskDetailVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- serviceSubtaskDetailVOList.add(serviceSubtaskDetailVO);
- }
- return serviceSubtaskDetailVOList;
+ public List<SvyLibTemplateScriptVO> getQuestionCache(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));
+ //闂嵎
+ List<SvyLibTemplateScriptVO> svyTaskTemplateScriptVOList = redisCache.getCacheList(pid + "-" + tid + "-WJscriptCache");
+ return svyTaskTemplateScriptVOList;
}
- private Long setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid) {
- //涓嬮璺宠浆
- Long nextScriptNo = null;
+ @Override
+ public Map<String, Object> selectPatQuestionResult(ServiceSubTaskQueryReq serviceSubTaskQueryReq) {
+ log.error("selectPatQuesTionResult鐨勫叆鍙備负锛歿}", serviceSubTaskQueryReq);
+ Map<String, Object> map = new HashMap<>();
+ Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid());
+ if (scriptInfoByCondition.get("type").equals("1")) {
+ List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
+ for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
+ String scriptResult = getScriptResult(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), ivrLibaTemplateScriptVO.getId());
+ ivrLibaTemplateScriptVO.setScriptResult(scriptResult);
+ }
+ map.put("scriptResult", ivrLibaTemplateScriptVOList);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
+ } else if (scriptInfoByCondition.get("type").equals("2")) {
+ List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
+ for (SvyLibTemplateScriptVO svyLibTemplateScriptVO : svyLibTemplateScriptVOList) {
+ String scriptResult = getScriptResult(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), svyLibTemplateScriptVO.getId());
+ svyLibTemplateScriptVO.setScriptResult(scriptResult);
+ }
+ map.put("scriptResult", scriptInfoByCondition);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
+ } else if (scriptInfoByCondition.get("type").equals("3")) {
+ //瀹ｆ暀涓嶉渶瑕佹煡鐪�
+ List<HeLibrary> heLibraryList = (List) scriptInfoByCondition.get("script");
+ map.put("scriptResult", heLibraryList);
+ map.put("taskName", scriptInfoByCondition.get("taskName"));
+ return map;
+ }
+
+ return null;
+ }
+
+ private String getScriptResult(Long tid, Long pid, Long sid) {
+ ServiceSubtaskDetail serviceSubtaskDetail = new ServiceSubtaskDetail();
+ serviceSubtaskDetail.setTaskid(tid);
+ serviceSubtaskDetail.setPatid(pid);
+ serviceSubtaskDetail.setScriptid(sid);
+ List<ServiceSubtaskDetail> serviceSubtaskDetails = serviceSubtaskDetailMapper.selectServiceSubtaskDetailList(serviceSubtaskDetail);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
+ return serviceSubtaskDetails.get(0).getAsrtext();
+ }
+ return "";
+ }
+
+ private Map<String, String> setWJInfo(SvyTaskTemplateScriptVO svyTaskTemplateScriptVO, Long taskid, Long patid) {
+ ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
+ serviceSubtaskVO.setTaskid(taskid);
+ serviceSubtaskVO.setPatid(patid);
+ List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO);
+
+ String score = "0";
+ //涓嬮璺宠浆
+ String nextScriptNo = null;
ServiceSubtaskDetailVO serviceSubtaskDetailVO = new ServiceSubtaskDetailVO();
List<ServiceSubtaskOptionAnswer> answerList = new ArrayList<>();
if (svyTaskTemplateScriptVO.getScriptType().equals("1") || svyTaskTemplateScriptVO.getScriptType().equals("2")) {
@@ -200,45 +285,66 @@
for (SvyTaskTemplateTargetoption svyTaskTemplateTargetoption : svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions()) {
//灏嗛棶棰橀�夐」璁板綍涓嬫潵
if (StringUtils.isEmpty(serviceSubtaskDetailVO.getTargetvalue())) {
- serviceSubtaskDetailVO.setTargetvalue(svyTaskTemplateTargetoption.getTargetvalue());
+ serviceSubtaskDetailVO.setTargetvalue(svyTaskTemplateTargetoption.getOptioncontent());
} else {
- serviceSubtaskDetailVO.setTargetvalue(serviceSubtaskDetailVO.getTargetvalue() + " " + svyTaskTemplateTargetoption.getTargetvalue());
+ serviceSubtaskDetailVO.setTargetvalue(serviceSubtaskDetailVO.getTargetvalue() + " " + svyTaskTemplateTargetoption.getOptioncontent());
}
-
- if (svyTaskTemplateTargetoption.getIsUserOperation() == true) {
- //灏嗛�変腑鐨勭粨鏋滄斁鍒癮srtext涓�
- if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
- serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateTargetoption.getTargetvalue());
- } else {
- //濡傛灉鏄閫夛紝绛旀闇�瑕佺敤 & 杩涜鎷兼帴
- serviceSubtaskDetailVO.setAsrtext(serviceSubtaskDetailVO.getAnswerps() + "&" + svyTaskTemplateTargetoption.getTargetvalue());
- }
- if (svyTaskTemplateScriptVO.getScriptType().equals("1") && svyTaskTemplateScriptVO.getBranchFlag().equals("1")) {
- //鏄崟閫夛紝骞朵笖鏄湁鍒嗘敮鐨�
- nextScriptNo = svyTaskTemplateTargetoption.getNextQuestion();
- } else {
- nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
- }
- }
+// if (svyTaskTemplateTargetoption.getIsUserOperation() == true) {
+// //灏嗛�変腑鐨勭粨鏋滄斁鍒癮srtext涓�
+// if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
+// //鍜屽墠绔晢閲忥紝鍓嶇浼氬皢閫変腑鐨勭粨鏋滄洿鏂板埌闂涓�
+//// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateTargetoption.getTargetvalue());
+// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
+// } else {
+// //濡傛灉鏄閫夛紝绛旀闇�瑕佺敤 & 杩涜鎷兼帴(//鍜屽墠绔晢閲忥紝鍓嶇浼氬皢閫変腑鐨勭粨鏋滄洿鏂板埌闂涓�)
+//// serviceSubtaskDetailVO.setAsrtext(serviceSubtaskDetailVO.getAnswerps() + "&" + svyTaskTemplateTargetoption.getTargetvalue());
+// serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
+// }
+// if (svyTaskTemplateScriptVO.getScriptType().equals("1") && svyTaskTemplateScriptVO.getBranchFlag().equals("1")) {
+// //鏄崟閫夛紝骞朵笖鏄湁鍒嗘敮鐨�(鍜屽墠绔晢閲忥紝鍦ㄥ閾剧粨鏋滀繚瀛樻椂锛屼細灏嗛�変腑鐨勯�夐」涓婄殑璺宠浆鏇存柊鍒伴鐩笂)
+//// nextScriptNo = svyTaskTemplateTargetoption.getNextQuestion().toString();
+// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+// score = svyTaskTemplateTargetoption.getScore().toString();
+// } else {
+// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+// score = svyTaskTemplateScriptVO.getScore().toString();
+// }
+// }
}
- serviceSubtaskDetailVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions());
+ nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+ if (svyTaskTemplateScriptVO.getScore() != null) {
+ score = String.valueOf(svyTaskTemplateScriptVO.getScore());
+ }
+ serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
+// if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) {
+// nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+// }
+// serviceSubtaskDetailVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions());
} else {
//闈炲崟澶氶��
- if (CollectionUtils.isNotEmpty(svyTaskTemplateScriptVO.getSvyTaskTemplateTargetoptions())) {
+ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptResult())) {
serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult());
- nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
+ nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
+ if (svyTaskTemplateScriptVO.getScore() != null) {
+ score = String.valueOf(svyTaskTemplateScriptVO.getScore());
+ }
}
}
+ serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));
serviceSubtaskDetailVO.setPatid(Long.valueOf(patid));
serviceSubtaskDetailVO.setScriptid(svyTaskTemplateScriptVO.getId());
serviceSubtaskDetailVO.setValueType(svyTaskTemplateScriptVO.getScriptType());
- serviceSubtaskDetailVO.setAsrtext(JSON.toJSONString(answerList));
serviceSubtaskDetailVO.setComment(null);
serviceSubtaskDetailVO.setCreateTime(new Date());
serviceSubtaskDetailVO.setUpdateTime(new Date());
+ serviceSubtaskDetailVO.setSubId(selectServiceSubtaskList.get(0).getId());
ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class);
serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
- return nextScriptNo;
+
+ Map<String, String> map = new HashMap<>();
+ map.put("nextScriptNo", nextScriptNo);
+ map.put("score", score);
+ return map;
}
}
--
Gitblit v1.9.3