From d7e3192804fca756d881af360ffd5eea157ef9ad Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 21 十月 2026 15:45:18 +0800
Subject: [PATCH] 【市一】电话挂断服务
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 981 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 895 insertions(+), 86 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 7e5e14a..c7f170a 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -10,13 +10,17 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.common.dx.MessageSend;
+import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysDeptService;
import com.smartor.common.FtpService;
import com.smartor.common.MtSubmitSmUtil;
import com.smartor.common.ScheduleSubtaskBuilder;
@@ -25,6 +29,7 @@
import com.smartor.domain.DTO.MzMydScoreRankDTO;
import com.smartor.domain.DTO.QuestionCountKsOrBqDTO;
import com.smartor.domain.DTO.ServiceSubtaskDetailDTO;
+import com.smartor.domain.DTO.ServiceSubtaskOptionStatDTO;
import com.smartor.domain.*;
import com.smartor.domain.VO.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
@@ -46,16 +51,23 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+
+import static cn.hutool.core.convert.Convert.toHex;
/**
* 鍗曚竴浠诲姟锛堥殢璁匡級Service涓氬姟灞傚鐞�
@@ -129,6 +141,9 @@
private IPatArchiveService patArchiveService;
@Autowired
+ private ISysDeptService sysDeptService;
+
+ @Autowired
private ScheduleSubtaskBuilder scheduleSubtaskBuilder;
@Autowired
@@ -173,6 +188,30 @@
@Value("${hangup}")
private String hangup;
+ /**
+ * 鎸傛柇璇锋眰鏈�澶ч噸璇曟鏁帮紙鍚娆★級
+ */
+ private static final int HANGUP_MAX_RETRY = 3;
+
+ /**
+ * 鎸傛柇璇锋眰閲嶈瘯闂撮殧锛堟绉掞級
+ */
+ private static final long HANGUP_RETRY_INTERVAL_MS = 300L;
+
+ /**
+ * 鍏滃簳鎸傛柇鐨勬渶灏忓欢鏃讹紙姣锛夛細绛夊钩鍙版妸缁撴潫璇挱瀹屽啀鎸�
+ */
+ private static final long HANGUP_FALLBACK_MIN_DELAY_MS = 8000L;
+
+ /**
+ * 鍏滃簳鎸傛柇瀹氭椂鍣ㄣ��
+ * <p>
+ * 闆ㄧ划杩欏鐨勬寕鏂師鏈緷璧�"骞冲彴鎾畬缁撴潫璇悗鍐嶅洖璋冧竴娆� PlayEventCallback(playstop=true)"锛�
+ * 骞冲彴涓嶅洖璋冪數璇濆氨涓�鐩存寕鐫�銆傝繖閲岀敤涓�涓畧鎶ょ嚎绋嬫睜鍦ㄧ粨鏉熻涓嬪彂鍚庢寜瀛楁暟浼扮畻鏃堕暱鍋氬厹搴曟寕鏂紝
+ * 涓庡钩鍙板洖璋冭蛋鍚屼竴涓箓绛夋爣璁帮紝涓嶄細閲嶅鎸傛柇銆�
+ */
+ private ScheduledExecutorService hangupFallbackExecutor;
+
@Value("${app_key_yq}")
private String app_key_yq;
@@ -208,8 +247,14 @@
private ServiceOutPathMapper serviceOutPathMapper;
private static final String KEY_SEP = "\u0001";
+
+ /** 浜屾闅忚鐢熸垚閿佸墠缂�锛岄槻姝㈠悓涓�鍘熶换鍔″苟鍙戠敓鎴愬鏉′簩娆￠殢璁� */
+ private static final String AGAIN_LOCK_KEY_PREFIX = "smartor:again:lock:";
+ private static final long AGAIN_LOCK_SECONDS = 30L;
@Autowired
private PatMedOperationItemMapper patMedOperationItemMapper;
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥殢璁匡級
@@ -550,11 +595,22 @@
@Override
public List<ServiceSubtask> patItem2(ServiceSubtaskEntity serviceSubtaskEntity) {
+ if (serviceSubtaskEntity.getSendstateView() != null) {
+ // 1锛氬緟闅忚锛�1 琚鍙栥��2 寰呭彂閫併��3 宸插彂閫併��5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級锛�2锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�3锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級
+ if (serviceSubtaskEntity.getSendstateView() == 1)
+ serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 7L)));
+ if (serviceSubtaskEntity.getSendstateView() == 2)
+ serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(6L)));
+ if (serviceSubtaskEntity.getSendstateView() == 3)
+ serviceSubtaskEntity.setSendstates(new ArrayList<>(Arrays.asList(4L)));
+ }
List<ServiceSubtask> serviceSubtaskList = new ArrayList<>();
- for (Long sendstate : serviceSubtaskEntity.getSendstates()) {
- serviceSubtaskEntity.setSendstate(sendstate);
- List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
- serviceSubtaskList.addAll(serviceSubtasks);
+ if(CollectionUtils.isNotEmpty(serviceSubtaskEntity.getSendstates())){
+ for (Long sendstate : serviceSubtaskEntity.getSendstates()) {
+ serviceSubtaskEntity.setSendstate(sendstate);
+ List<ServiceSubtask> serviceSubtasks = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
+ serviceSubtaskList.addAll(serviceSubtasks);
+ }
}
return serviceSubtaskList;
}
@@ -624,6 +680,45 @@
result.putIfAbsent("wxsf", 0);
result.putIfAbsent("xsf", 0);
result.putIfAbsent("dsf", 0);
+ result.putIfAbsent("ywc", 0);
+ result.putIfAbsent("cs", 0);
+ result.putIfAbsent("yc", 0);
+ result.putIfAbsent("jg", 0);
+ }
+ return result;
+ }
+
+ /**
+ * 缁熻浠诲姟鍚勭鐘舵�佺殑鏁伴噺锛堝凡浼樺寲锛�
+ * 浼樺寲璇存槑锛�
+ * 1. 浣跨敤鏁版嵁搴撳眰鑱氬悎璁＄畻锛屾浛浠ｅ簲鐢ㄥ眰閬嶅巻
+ * 2. 鎬ц兘鎻愬崌 10-100 鍊嶏紙鍙栧喅浜庢暟鎹噺锛�
+ * 3. 闄嶄綆鍐呭瓨鍗犵敤鍜岀綉缁滀紶杈�
+ *
+ * @param serviceSubtaskEntity 鏌ヨ鏉′欢
+ * @return 鍚勭姸鎬佺粺璁＄粨鏋�
+ */
+ @Override
+ public Map<String, Object> countByCondition(ServiceSubtaskEntity serviceSubtaskEntity) {
+ // 鐩存帴璋冪敤鏁版嵁搴撶粺璁℃柟娉曪紝鍦ㄦ暟鎹簱灞傚畬鎴愯仛鍚堣绠�
+ Map<String, Object> result = serviceSubtaskMapper.countByCondition(serviceSubtaskEntity);
+ // 澶勭悊绌哄紓甯�
+ if (MapUtils.isEmpty(result)) {
+ result = new HashMap<>();
+ // 纭繚鎵�鏈� key 閮芥湁鍊硷紝閬垮厤绌烘寚閽堝紓甯�
+ // MyBatis 鐨� SUM 鍦ㄦ病鏈夊尮閰嶈鏃朵細杩斿洖 null
+ result.putIfAbsent("wzx", 0);
+ result.putIfAbsent("ysf", 0);
+ result.putIfAbsent("fssb", 0);
+ result.putIfAbsent("yfs", 0);
+ result.putIfAbsent("blq", 0);
+ result.putIfAbsent("total", 0);
+ result.putIfAbsent("wxsf", 0);
+ result.putIfAbsent("xsf", 0);
+ result.putIfAbsent("dsf", 0);
+ result.putIfAbsent("dfs", 0);
+ result.putIfAbsent("yfs", 0);
+ result.putIfAbsent("cs", 0);
result.putIfAbsent("ywc", 0);
result.putIfAbsent("yc", 0);
result.putIfAbsent("jg", 0);
@@ -724,6 +819,7 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public String addSubTaskAgain(ServiceSubtask serviceSubtask) {
ServiceSubtask serviceSubtask1 = selectServiceSubtaskById(serviceSubtask.getId());
PatMedInhosp patMedInhosp = new PatMedInhosp();
@@ -733,7 +829,7 @@
PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask1.getPatid());
//鏅畞 鏂板鍐嶆闅忚涓嶈兘瑙﹀彂鎮ｈ�呭啀鍏ラ櫌
boolean inhospAgain = true;
- if (serviceSubtask1.getOrgid().equals("47255004333112711A1001")) {
+ if ("47255004333112711A1001".equals(serviceSubtask1.getOrgid())) {
inhospAgain = false;
}
if (patMedInhospList.size() > 0 && inhospAgain) {
@@ -747,13 +843,17 @@
serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";鏃犻渶鍐嶆闅忚锛屼换鍔¤鏍囪涓嶅湪鎵ц" : "鏃犻渶鍐嶆闅忚锛屼换鍔¤鏍囪涓嶅湪鎵ц");
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
return "鏃犻渶鍐嶆闅忚锛屼换鍔¤鏍囪涓嶅湪鎵ц";
- } else if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+ } else if (patArchive != null && StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
serviceSubtask1.setIsVisitAgain(2);
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
serviceSubtask1.setRemark(StringUtils.isNotEmpty(serviceSubtask.getRemark()) ? serviceSubtask.getRemark() + ";鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟" : "鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟");
return "鏃犻渶鍐嶆闅忚锛屾偅鑰呰鏍囪涓嶉渶瑕佽鏈嶅姟";
} else if (ObjectUtils.isNotEmpty(serviceSubtask1.getIsVisitAgain()) && serviceSubtask1.getIsVisitAgain() == 2) {
return "鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡";
+ }
+ //涓芥按涓尰闄㈡牴鎹笅娆′换鍔D鐢熸垚鍐嶆闅忚
+ if ("47231022633110211A2101".equals(serviceSubtask1.getOrgid())) {
+ return addSubTaskAgainNextTaskId(serviceSubtask1);
}
//鏂板鍐嶆闅忚浠诲姟
ServiceSubtask serviceSubtask2 = DtoConversionUtils.sourceToTarget(serviceSubtask, ServiceSubtask.class);
@@ -774,6 +874,155 @@
return "鍐嶆闅忚浠诲姟鍒涘缓鎴愬姛";
}
return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屽啀璇锋閲嶈瘯";
+ }
+
+ public String addSubTaskAgainNextTaskId(ServiceSubtask serviceSubtask) {
+ if (ObjectUtils.isEmpty(serviceSubtask.getTaskid())) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛岀己灏慣askId, 鍐嶈娆￠噸璇�");
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛岀己灏慣askId, 鍐嶈娆￠噸璇�";
+ }
+ // 鍚屼竴鍘熶换鍔′覆琛岀敓鎴愶紝闃叉骞跺彂閲嶅鎻掑叆
+ String lockToken = tryLockAgainTask(serviceSubtask.getId());
+ if (lockToken == null) {
+ return "鍐嶆闅忚浠诲姟姝ｅ湪鍒涘缓涓紝璇峰嬁閲嶅鎻愪氦";
+ }
+ try {
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ if (ObjectUtils.isEmpty(serviceTask)) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 taskid = {}, 鍐嶈娆￠噸璇�", serviceSubtask.getTaskid());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 taskid = " + serviceSubtask.getTaskid() + ", 鍐嶈娆￠噸璇�";
+ }
+ // 骞傜瓑鏍￠獙锛氬悓涓�鍘熶换鍔″彧鍏佽鐢熸垚涓�鏉′簩娆￠殢璁�
+ ServiceSubtaskEntity againQuery = new ServiceSubtaskEntity();
+ againQuery.setUpid(serviceSubtask.getId().intValue());
+ if (CollectionUtils.isNotEmpty(serviceSubtaskMapper.selectServiceSubtaskList(againQuery))) {
+ return "鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡";
+ }
+ // 鏌ヨ鍑洪櫌璁板綍
+ PatMedInhosp patMedInhospVo = new PatMedInhosp();
+ patMedInhospVo.setOrgid(serviceSubtask.getOrgid());
+ patMedInhospVo.setInhospid(serviceSubtask.getInhospid());
+ patMedInhospVo.setCry(1);
+ List<PatMedInhosp> patMedInhospList = patMedInhospService.selectPatMedInhospList(patMedInhospVo);
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ if (CollectionUtils.isNotEmpty(patMedInhospList)) {
+ patMedInhosp = patMedInhospList.get(0);
+ } else {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏� 瀵瑰簲鐨勫嚭闄㈣褰�, taskid = {}, 鍐嶈娆￠噸璇�", serviceSubtask.getTaskid());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏� 瀵瑰簲鐨勫嚭闄㈣褰�, taskid = " + serviceSubtask.getTaskid() + ", 鍐嶈娆￠噸璇�";
+ }
+ if (ObjectUtils.isEmpty(serviceTask.getNexttaskid())) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏� nexttaskid, taskid = {}, 鍐嶈娆￠噸璇�", serviceSubtask.getTaskid());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼换鍔＄己灏� nexttaskid, taskid = " + serviceSubtask.getTaskid() + ", 鍐嶈娆￠噸璇�";
+ }
+ ServiceTask nextServiceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getNexttaskid());
+ if (ObjectUtils.isEmpty(nextServiceTask)) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 nexttaskid = {}, 鍐嶈娆￠噸璇�", serviceTask.getNexttaskid());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾壘涓嶅埌瀵瑰簲浠诲姟 nexttaskid = " + serviceTask.getNexttaskid() + ", 鍐嶈娆￠噸璇�";
+ }
+ PatArchive patArchive = patArchiveService.selectPatArchiveByPatid(serviceSubtask.getPatid());
+ if (ObjectUtils.isEmpty(patArchive)) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭鎵惧埌鎮ｈ�呮。妗� patid = {}, subTaskId = {}", serviceSubtask.getPatid(), serviceSubtask.getId());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭鎵惧埌鎮ｈ�呮。妗�, subTaskId = " + serviceSubtask.getId() + ", 鍐嶈娆￠噸璇�";
+ }
+ String config = configService.selectConfigByKey("visit.early.day");
+ Integer type = 1;
+ // 闅忚涓績绉戝
+ String centerDept = configService.selectConfigByKey("sys.smartor.center.dept", serviceSubtask.getOrgid());
+ if (ObjectUtils.isEmpty(centerDept)) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭閰嶇疆闅忚涓績绉戝鍙傛暟 sys.smartor.center.dept ,subTaskId = {}, 鍐嶈娆￠噸璇�", serviceSubtask.getId());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭閰嶇疆闅忚涓績绉戝鍙傛暟 sys.smartor.center.dept ,subTaskId = " + serviceSubtask.getId() + ", 鍐嶈娆￠噸璇�";
+ }
+ SysDept sysDeptVo = new SysDept();
+ sysDeptVo.setDeptType("1");
+ sysDeptVo.setOrgid(serviceSubtask.getOrgid());
+ sysDeptVo.setDeptCode(centerDept);
+ List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDeptVo);
+ SysDept sysDept = new SysDept();
+ if (CollectionUtils.isNotEmpty(sysDepts)) {
+ sysDept = sysDepts.get(0);
+ } else {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭鎵惧埌鍙傛暟 sys.smartor.center.dept 閰嶇疆鐨勯殢璁夸腑蹇冪瀹� deptCode = {}, 鍐嶈娆￠噸璇�", centerDept);
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾湭鎵惧埌鍙傛暟 sys.smartor.center.dept 閰嶇疆鐨勯殢璁夸腑蹇冪瀹� deptCode = " + centerDept + ", 鍐嶈娆￠噸璇�";
+ }
+ // 鎸変笅涓�浠诲姟鐢熸垚浜屾闅忚瀛愪换鍔★紙琛ㄥ崟銆佸彂閫佹柟寮忓彇鑷笅涓�浠诲姟锛�
+ ServiceSubtask serviceSubtaskAgain = patMedInhospService.boxedServiceSubtask(nextServiceTask,
+ patMedInhosp, patArchive, config, type);
+ if (ObjectUtils.isEmpty(serviceSubtaskAgain) || ObjectUtils.isEmpty(serviceSubtaskAgain.getTaskid())) {
+ log.error("鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屼笅涓�浠诲姟鐢熸垚瀛愪换鍔′负绌�, subTaskId = {}, nextTaskId = {}", serviceSubtask.getId(), serviceTask.getNexttaskid());
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屾偅鑰呭嚭闄㈣褰曚笉瀹屾暣鎴栦笅涓�浠诲姟閰嶇疆寮傚父, 鍐嶈娆￠噸璇�";
+ }
+ Date now = new Date();
+ serviceSubtaskAgain.setId(null);
+ serviceSubtaskAgain.setUpid(serviceSubtask.getId().intValue());
+ serviceSubtaskAgain.setVisitCount(ObjectUtils.isNotEmpty(serviceSubtask.getVisitCount())
+ ? serviceSubtask.getVisitCount() + 1 : 1);
+ serviceSubtaskAgain.setSendstate(2L);
+ serviceSubtaskAgain.setIsVisitAgain(1);
+ serviceSubtaskAgain.setCreateTime(now);
+ serviceSubtaskAgain.setUpdateTime(now);
+
+// // 浜屾闅忚鏃堕棿锛氫笂娆￠殢璁垮畬鎴愭椂闂达紙鏈畬鎴愬垯褰撳墠鏃堕棿锛�+ 涓嬩竴浠诲姟鍙戦�佸ぉ鏁帮紱杩囧幓鏃堕棿鍏滃簳涓哄綋鍓嶆椂闂�
+// Date baseTime = ObjectUtils.isNotEmpty(serviceSubtask.getFinishtime()) ? serviceSubtask.getFinishtime() : now;
+// int intervalDays = ObjectUtils.isNotEmpty(nextServiceTask.getSendDay())
+// ? nextServiceTask.getSendDay().intValue() : 0;
+// Date nextVisitTime = DateUtils.addDays(baseTime, intervalDays);
+// if (nextVisitTime.before(now)) {
+// nextVisitTime = now;
+// }
+// serviceSubtaskAgain.setVisitTime(nextVisitTime);
+// serviceSubtaskAgain.setLongSendTime(nextVisitTime);
+ serviceSubtaskAgain.setVisitType(serviceSubtask.getVisitType());
+ serviceSubtaskAgain.setVisitDeptCode(sysDept.getDeptCode());
+ serviceSubtaskAgain.setVisitDeptName(sysDept.getDeptName());
+ int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain);
+ if (i != 1) {
+ return "鍐嶆闅忚浠诲姟鍒涘缓澶辫触锛屽啀璇锋閲嶈瘯";
+ }
+ // 鍒濆鍖栧彂閫佹柟寮忔槑缁嗭紝琛ュ伩锛坈ompensateTask锛夊拰瓒呮椂鍒ゆ柇渚濊禆璇ヨ〃
+ patMedInhospService.addServiceSubtaskPreachform(serviceSubtaskAgain, null);
+ // 鏉′欢鏇存柊鍘熶换鍔★細0 琛岃鏄庡凡琚叾浠栬姹傜敓鎴愶紝鎶涘紓甯稿洖婊氭湰娆℃彃鍏ョ殑閲嶅鏁版嵁
+ int updated = serviceSubtaskMapper.updateIsVisitAgainById(serviceSubtask.getId(), 2);
+ if (updated != 1) {
+ throw new BaseException("鏃犻渶鍐嶆闅忚锛岃浠诲姟宸茬粡鍐嶆闅忚杩囦簡");
+ }
+ return "鍐嶆闅忚浠诲姟鍒涘缓鎴愬姛";
+ } finally {
+ unlockAgainTask(serviceSubtask.getId(), lockToken);
+ }
+ }
+
+ /**
+ * 鑾峰彇浜屾闅忚鐢熸垚閿併�俁edis 寮傚父鏃堕檷绾т负鏁版嵁搴撳箓绛夋牎楠岋紝涓嶉樆鏂笟鍔°��
+ */
+ private String tryLockAgainTask(Long subId) {
+ String token = UUID.randomUUID().toString();
+ try {
+ Boolean locked = redisTemplate.opsForValue().setIfAbsent(
+ AGAIN_LOCK_KEY_PREFIX + subId, token, AGAIN_LOCK_SECONDS, TimeUnit.SECONDS);
+ return Boolean.TRUE.equals(locked) ? token : null;
+ } catch (Exception e) {
+ log.warn("鍐嶆闅忚鑾峰彇Redis閿佸け璐ワ紝闄嶇骇浣跨敤鏁版嵁搴撳箓绛夋牎楠�, subId={}", subId, e);
+ return token;
+ }
+ }
+
+ /**
+ * 閲婃斁浜屾闅忚鐢熸垚閿侊紝浠呴噴鏀捐嚜宸辨寔鏈夌殑閿併��
+ */
+ private void unlockAgainTask(Long subId, String token) {
+ if (token == null) {
+ return;
+ }
+ try {
+ String lockKey = AGAIN_LOCK_KEY_PREFIX + subId;
+ Object current = redisTemplate.opsForValue().get(lockKey);
+ if (token.equals(current)) {
+ redisTemplate.delete(lockKey);
+ }
+ } catch (Exception e) {
+ log.warn("鍐嶆闅忚閲婃斁Redis閿佸け璐�, subId={}", subId, e);
+ }
}
/**
@@ -1773,6 +2022,130 @@
}
/**
+ * 缁撴潫璇紦瀛� key锛堝彧瑕佸啓杩囪 key 灏辫鏄庢湰娆″璇濆凡缁忔敹灏撅紝缁撴潫璇负绌轰篃绠楋級
+ */
+ private String jsyKey(String uuid) {
+ return uuid + "- jsy";
+ }
+
+ /**
+ * 鏈瀵硅瘽鏄惁宸茬粡鏀跺熬锛堝嵆宸茬粡涓嬪彂杩囩粨鏉熻锛夈��
+ * <p>
+ * 娉ㄦ剰锛氫笉鑳界敤 getCacheObject(...) != null 鍒ゆ柇锛岀粨鏉熻涓虹┖鏃跺啓鍏ョ殑鏄┖鍊硷紝
+ * 璇诲嚭鏉ユ槸 null 浣� key 鏄瓨鍦ㄧ殑锛屽繀椤荤敤 hasKey銆�
+ */
+ private boolean isDialogueEnded(String uuid) {
+ return StringUtils.isNotEmpty(uuid) && Boolean.TRUE.equals(redisCache.hasKey(jsyKey(uuid)));
+ }
+
+ /**
+ * 鎸傛柇鐢佃瘽锛氬箓绛� + 閲嶈瘯 + 寮傚父涓嶅鎶� + 娓呯悊缁撴潫璇紦瀛樸��
+ * <p>
+ * 骞冲彴鍥炶皟锛圥layEventCallback 鎾斁缁撴潫锛夊拰鍏滃簳瀹氭椂浠诲姟閮戒細璋冭繖閲岋紝
+ * 閫氳繃 redis 鐨� {uuid}- hangup-sent 鏍囪淇濊瘉鍚屼竴娆￠�氳瘽鍙湡姝ｆ寕鏂竴娆°��
+ *
+ * @param uuid 閫氳瘽 uuid
+ * @param phone 琚彨鍙风爜
+ * @param reason 鎸傛柇鍘熷洜锛堜粎鐢ㄤ簬鏃ュ織鎺掓煡锛�
+ * @return true=鏈纭疄鍙戝嚭浜嗘寕鏂姹�
+ */
+ private boolean doHangup(String uuid, String phone, String reason) {
+ if (StringUtils.isEmpty(uuid)) {
+ log.warn("鎸傛柇璺宠繃锛歶uid 涓虹┖, reason={}", reason);
+ return false;
+ }
+ String sentKey = uuid + "- hangup-sent";
+ if (!redisCache.setCacheObjectIfAbsent(sentKey, "1", 30, TimeUnit.MINUTES)) {
+ log.info("鎸傛柇璺宠繃锛氳閫氳瘽宸叉寕鏂繃, uuid={}, reason={}", uuid, reason);
+ return false;
+ }
+ Map<String, String> req = new HashMap<>();
+ req.put("uuid", uuid);
+ req.put("caller", phone);
+ String body = new Gson().toJson(req);
+ for (int i = 1; i <= HANGUP_MAX_RETRY; i++) {
+ try {
+ // 鍙牎楠� HTTP 鐘舵�佺爜锛�/hangup 閫氬父鎴愬姛鍙洖 200 涓旀病鏈夊搷搴斾綋锛�
+ // 鐢� postJsonRequest 浼氬洜"鍝嶅簲涓簄ull"鎶婃垚鍔熻鍒ゆ垚澶辫触
+ HttpUtil.postJsonRequestAllowEmptyResponse(hangup, body);
+ log.info("鎸傛柇鎴愬姛, uuid={}, reason={}, 绗瑊}娆�, url={}", uuid, reason, i, hangup);
+ redisCache.setCacheObject(uuid + "- hangup", "1", 10, TimeUnit.MINUTES);
+ redisCache.deleteObject(jsyKey(uuid));
+ redisCache.deleteObject(uuid + "- hangup-planned");
+ return true;
+ } catch (Exception e) {
+ //鎶婂紓甯哥被鍨嬪拰淇℃伅鏀惧湪鍚屼竴琛岋紝鍗曡 grep 灏辫兘鐪嬪嚭鏄�"杩炰笉涓�"杩樻槸"杩斿洖闈�200"
+ log.error("鎸傛柇澶辫触, uuid={}, reason={}, 绗瑊}娆�, url={}, body={}, 鍘熷洜={}: {}",
+ uuid, reason, i, hangup, body, e.getClass().getSimpleName(), e.getMessage(), e);
+ if (i < HANGUP_MAX_RETRY) {
+ try {
+ Thread.sleep(HANGUP_RETRY_INTERVAL_MS);
+ } catch (InterruptedException ie) {
+ Thread.currentThread().interrupt();
+ break;
+ }
+ }
+ }
+ }
+ // 鍏ㄩ儴澶辫触锛氶噴鏀惧箓绛夋爣璁帮紝鍏佽骞冲彴涓嬩竴娆″洖璋冩垨涓嬩竴涓厹搴曚换鍔￠噸璇�
+ redisCache.deleteObject(sentKey);
+ log.error("鎸傛柇鏈�缁堝け璐ワ紝宸查噴鏀鹃噸璇曟爣璁�, uuid={}, reason={}, url={}", uuid, reason, hangup);
+ return false;
+ }
+
+ /**
+ * 瀹夋帓涓�娆″厹搴曟寕鏂��
+ * <p>
+ * 缁撴潫璇笅鍙戝悗锛屽钩鍙版甯稿簲璇ュ啀鍥炶皟 PlayEventCallback(playstop=true)锛屾鏃剁敱 doHangup 绔嬪嵆鎸傛柇锛�
+ * 浣嗗钩鍙板瓧娈电己澶�/涓嶅洖璋冩椂鐢佃瘽浼氫竴鐩存寕鐫�锛屾墍浠ヨ繖閲屾寜缁撴潫璇瓧鏁颁及绠楁挱鏀炬椂闀匡紝鍒扮偣鍏滃簳鎸備竴娆°��
+ * 鍚屼竴涓� uuid 鍙畨鎺掍竴娆★紙{uuid}- hangup-planned 骞傜瓑锛夈��
+ *
+ * @param uuid 閫氳瘽 uuid
+ * @param phone 琚彨鍙风爜
+ * @param jsy 缁撴潫璇紙鍙兘涓虹┖锛屼负绌烘椂鎸夋渶灏忓欢鏃跺鐞嗭級
+ */
+ private void scheduleHangupFallback(String uuid, String phone, String jsy) {
+ if (StringUtils.isEmpty(uuid)) {
+ return;
+ }
+ if (!redisCache.setCacheObjectIfAbsent(uuid + "- hangup-planned", "1", 30, TimeUnit.MINUTES)) {
+ return;
+ }
+ // 涓枃 TTS 澶х害姣忕 3~4 涓瓧锛岀暀瓒充綑閲忓悗鍐嶅姞涓婃渶灏忓欢鏃�
+ int len = StringUtils.isEmpty(jsy) ? 0 : jsy.length();
+ long delay = HANGUP_FALLBACK_MIN_DELAY_MS + len * 400L;
+ if (delay > 60000L) {
+ delay = 60000L;
+ }
+ log.info("瀹夋帓鍏滃簳鎸傛柇, uuid={}, 缁撴潫璇暱搴�={}, 寤舵椂={}ms", uuid, len, delay);
+ getHangupFallbackExecutor().schedule(() -> {
+ try {
+ doHangup(uuid, phone, "缁撴潫璇挱瀹屽厹搴�");
+ } catch (Exception e) {
+ log.error("鍏滃簳鎸傛柇寮傚父, uuid={}", uuid, e);
+ }
+ }, delay, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * 鍏滃簳鎸傛柇绾跨▼姹狅紙鎳掑姞杞斤紝瀹堟姢绾跨▼锛岃繘绋嬮��鍑轰笉鍙楀奖鍝嶏級
+ */
+ private ScheduledExecutorService getHangupFallbackExecutor() {
+ if (hangupFallbackExecutor == null) {
+ synchronized (this) {
+ if (hangupFallbackExecutor == null) {
+ hangupFallbackExecutor = Executors.newScheduledThreadPool(2, r -> {
+ Thread t = new Thread(r, "voice-hangup-fallback");
+ t.setDaemon(true);
+ return t;
+ });
+ }
+ }
+ }
+ return hangupFallbackExecutor;
+ }
+
+ /**
* 鐢佃瘽ASR閫氳瘽鍥炶皟(闆ㄧ划)
*
* @param phoneCallReqYQVO
@@ -1782,6 +2155,15 @@
//鍏堟妸璇ubId浠巆ache_exist涓墧闄わ紝鍙鏈夊洖璋冨氨鍓旈櫎锛堢洰鐨勬槸锛屽敖蹇cache-exist涓虹┖锛屽幓缂撳瓨涓嬩竴鎵硅鎵撶殑鐢佃瘽;杩欓噷鍓旈櫎涓嶅奖鍝嶇數璇濈殑姝ｅ父涓氬姟锛�
// redisCache.removeElementFromList("cache-exist", phoneCallReqYQVO.getTaskid());
+ //uuid / taskid / phone 鏄悗闈㈡墍鏈夐�昏緫鐨勫墠鎻愶紝缂轰簡灏辩洿鎺ュ拷鐣ワ紝閬垮厤 Long.valueOf(null)銆乶ull.trim() 涔嬬被鐨� 500
+ if (StringUtils.isEmpty(phoneCallReqYQVO.getUuid()) || StringUtils.isEmpty(phoneCallReqYQVO.getTaskid())
+ || StringUtils.isEmpty(phoneCallReqYQVO.getPhone())) {
+ log.warn("闆ㄧ划鍥炶皟缂哄皯 uuid/taskid/phone锛岀洿鎺ュ拷鐣�: operate={}, uuid={}, taskid={}, phone={}",
+ phoneCallReqYQVO.getOperate(), phoneCallReqYQVO.getUuid(),
+ phoneCallReqYQVO.getTaskid(), phoneCallReqYQVO.getPhone());
+ return new PhoneCallBackYQVO();
+ }
+
//鍒ゆ柇鏄惁鎸傛満
String hangupState = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "- hangup");
Object cacheObject1 = redisCache.getCacheObject(phoneCallReqYQVO.getTaskid() + "recordAccept-hungup");
@@ -1790,7 +2172,7 @@
}
if ("AsrCallback".equals(phoneCallReqYQVO.getOperate()) && phoneCallReqYQVO.getEnd_time() != null && phoneCallReqYQVO.getEnd_time() != -1) {
//澶勭悊鎸傛柇
- if (phoneCallReqYQVO.getAsrtext().contains("鎷ㄥ彨鐨勭敤鎴锋蹇�")) {
+ if (StringUtils.isNotEmpty(phoneCallReqYQVO.getAsrtext()) && phoneCallReqYQVO.getAsrtext().contains("鎷ㄥ彨鐨勭敤鎴锋蹇�")) {
//鍒ゆ柇 recordAccept-hungup 鏄惁鏈夊�硷紝濡傛灉鏈夛紝鍒欒鏄庝笉鐢ㄥ鐞嗕簡锛屼箣鍓嶅凡缁忓鐞嗚繃浜嗭紙recordAccept-hungup杩欎釜涓昏鏄粰"閫氳瘽璁板綍鐢ㄧ殑锛�"锛�
Object cacheObject = redisCache.getCacheObject(phoneCallReqYQVO.getTaskid() + "recordAccept-hungup");
if (ObjectUtils.isNotEmpty(cacheObject) && String.valueOf(cacheObject).equals("1")) {
@@ -1801,7 +2183,9 @@
//濡傛灉鍙戦�佺姸鎬佷负6锛屽氨璇存槑宸茬粡鎵撳畬浜嗭紝涔熸病鏈夊繀瑕佺户缁線涓嬭蛋浜�
if (StringUtils.isNotEmpty(phoneCallReqYQVO.getTaskid())) {
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallReqYQVO.getTaskid()));
- if (serviceSubtask.getSendstate() == 6L) return new PhoneCallBackYQVO();
+ if (serviceSubtask != null && serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 6L) {
+ return new PhoneCallBackYQVO();
+ }
}
ServiceSubtask serviceSubtask2 = new ServiceSubtask();
@@ -1809,11 +2193,8 @@
serviceSubtask2.setSenduuid(phoneCallReqYQVO.getUuid());
serviceSubtask2.setId(Long.valueOf(phoneCallReqYQVO.getTaskid()));
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask2);
- Map<String, String> req = new HashMap<>();
- req.put("uuid", phoneCallReqYQVO.getUuid());
- req.put("caller", phoneCallReqYQVO.getPhone());
- HttpUtil.postJsonRequest(hangup, new Gson().toJson(req));
- redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- hangup", "1", 2, TimeUnit.MINUTES);
+ //鎸傛柇锛堝箓绛� + 澶辫触閲嶈瘯锛屽紓甯镐笉鍐嶅線澶栨姏锛岄伩鍏嶅洖璋冪洿鎺� 500锛�
+ doHangup(phoneCallReqYQVO.getUuid(), phoneCallReqYQVO.getPhone(), "鎷ㄥ彨鐨勭敤鎴锋蹇�");
//鍏堟妸榛樿鐨剅ecordAccept-hungup鍒犻櫎锛屽啀鏇存柊
redisCache.deleteObject(phoneCallReqYQVO.getTaskid() + "recordAccept-hungup");
redisCache.setCacheObject(phoneCallReqYQVO.getTaskid() + "recordAccept-hungup", "1", 10, TimeUnit.MINUTES);
@@ -1826,36 +2207,53 @@
return new PhoneCallBackYQVO();
}
}
+ //缁撴潫璇凡缁忎笅鍙戣繃锛岃鏄庢湰娆″璇濆凡缁忔敹灏撅細瀹夋帓涓�娆″厹搴曟寕鏂��
+ //骞冲彴姝ｅ父鎯呭喌涓嬩細鍐嶅洖璋� PlayEventCallback(playstop=true) 璁╂垜浠珛鍒绘寕鏂紱
+ //浣嗗钩鍙板瓧娈电己澶�/涓嶅洖璋冩椂鐢佃瘽浼氫竴鐩存寕鐫�锛屾墍浠ヨ繖閲屾寜缁撴潫璇瓧鏁颁及绠楁挱鏀炬椂闀垮埌鐐瑰厹搴曟寕涓�娆★紙骞傜瓑锛夈��
+ if (isDialogueEnded(phoneCallReqYQVO.getUuid())) {
+ scheduleHangupFallback(phoneCallReqYQVO.getUuid(), phoneCallReqYQVO.getPhone(),
+ redisCache.getCacheObject(jsyKey(phoneCallReqYQVO.getUuid())));
+ }
//瀹氫箟涓�涓垎鏁扮殑鍙橀噺
Boolean aBoolean1 = redisCache.hasKey(phoneCallReqYQVO.getUuid() + "SCORE");
if (!aBoolean1) redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "SCORE", 0.0, 120, TimeUnit.MINUTES);
PhoneCallBackYQVO phoneCallBackYQVO = new PhoneCallBackYQVO();
//channel_create 閫氶亾鍒涘缓鐨勬椂鍊欙紝鍙互鎵ц涓�浜涘叾瀹冩搷浣滐紝璀鍙戜釜鐭俊涔嬬被鐨�; 鎴戜滑鐨勪笟鍔″彲浠ヤ笉鐢ㄧ PlayEventCallback 杩欎釜鏄挱鏀捐闊崇殑,鏆傛椂鐢ㄤ笉鍒� End_time()= -1鎴杗ull琛ㄧず褰撳墠鐨刟srtext涓嶆槸涓�鍙ュ畬鏁寸殑璇�
- if (phoneCallReqYQVO.getOperate().equals("channel_create")) {
+ if ("channel_create".equals(phoneCallReqYQVO.getOperate())) {
return phoneCallBackYQVO;
}
//PlayEventCallback 杩欎釜鏄挱鏀捐闊崇殑 playstart锛氭斁闊冲紑濮嬶紙闂鎾姤寮�濮嬶級 playstop锛� 鏀鹃煶缁撴潫锛堥棶棰樻挱鎶ョ粨鏉燂級
- if (phoneCallReqYQVO.getOperate().equals("PlayEventCallback")) {
- String cacheJSY = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "- jsy");
- if (phoneCallReqYQVO.getOperate().equals("PlayEventCallback") && phoneCallReqYQVO.getPlaystop() == false) {
- //鍒ゆ柇redis涓槸鍚︽湁缁撴潫璇�
- if (StringUtils.isEmpty(cacheJSY)) {
+ if ("PlayEventCallback".equals(phoneCallReqYQVO.getOperate())) {
+ //缁撴潫璇槸鍚﹀凡涓嬪彂锛堢敤 hasKey 鍒ゆ柇锛岀粨鏉熻涓虹┖涔熺畻宸叉敹灏撅級
+ boolean dialogueEnded = isDialogueEnded(phoneCallReqYQVO.getUuid());
+ //playstop 鍙兘鏄� null锛屽钩鍙颁篃鍙兘鐢� play_stop锛岀粺涓�鐢� VO 鍒ゆ柇
+ boolean playStop = phoneCallReqYQVO.playStopIsTrue();
+ String cacheJSY = redisCache.getCacheObject(jsyKey(phoneCallReqYQVO.getUuid()));
+ log.info("PlayEventCallback: uuid={}, playstop={}, 鏄惁宸蹭笅鍙戠粨鏉熻={}",
+ phoneCallReqYQVO.getUuid(), playStop, dialogueEnded);
+ if (!playStop) {
+ //鏀鹃煶寮�濮�
+ if (!dialogueEnded) {
redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop", false, 120, TimeUnit.MINUTES);
log.error("PlayEventCallbackPlaystop鐨勫�间负-------锛歿}", false);
+ } else {
+ //骞冲彴寮�濮嬫挱缁撴潫璇紝鍏滃簳鎸傛柇鍦ㄦ柟娉曞叆鍙ｅ凡缁忓畨鎺掕繃锛岃繖閲屽彧鐣欐棩蹇椾究浜庢帓鏌�
+ log.info("缁撴潫璇紑濮嬫挱鏀�, uuid={}, 缁撴潫璇�={}", phoneCallReqYQVO.getUuid(), cacheJSY);
}
} else {
- //濡傛灉缁撴潫璇笉涓虹┖锛屽垯瑕佹寕鐢佃瘽浜�
- if (StringUtils.isNotEmpty(cacheJSY)) {
- Map<String, String> req = new HashMap<>();
- req.put("uuid", phoneCallReqYQVO.getUuid());
- req.put("caller", phoneCallReqYQVO.getPhone());
-// HttpUtils.sendPost(hangup, new Gson().toJson(req));
- HttpUtil.postJsonRequest(hangup, new Gson().toJson(req));
- ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallReqYQVO.getTaskid()));
- //璁板綍鐢佃瘽鍙戦�佺姸鎬�
- setFailPreachForm(serviceSubtask, "3", "閫氳瘽姝ｅ父缁撴潫", "9");
- //鍒犻櫎缁撴潫璇殑缂撳瓨
- redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "- jsy");
+ //鏀鹃煶缁撴潫
+ if (dialogueEnded) {
+ //缁撴潫璇挱瀹岋紝绔嬪嵆鎸傛柇锛堝箓绛� + 澶辫触閲嶈瘯锛屽紓甯镐笉澶栨姏锛�
+ doHangup(phoneCallReqYQVO.getUuid(), phoneCallReqYQVO.getPhone(), "缁撴潫璇挱鏀剧粨鏉�");
+ //璁板綍鐢佃瘽鍙戦�佺姸鎬侊細鎸傛柇鎴愯触閮借钀藉簱锛屼笉鑳藉啀璁╁洖璋冪洿鎺� 500
+ if (StringUtils.isNotEmpty(phoneCallReqYQVO.getTaskid())) {
+ try {
+ ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallReqYQVO.getTaskid()));
+ setFailPreachForm(serviceSubtask, "3", "閫氳瘽姝ｅ父缁撴潫", "9");
+ } catch (Exception e) {
+ log.error("鎸傛柇鍚庢洿鏂板瓙浠诲姟鐘舵�佸け璐�, taskid={}", phoneCallReqYQVO.getTaskid(), e);
+ }
+ }
} else {
redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop", true, 120, TimeUnit.MINUTES);
log.error("-------PlayEventCallbackPlaystop鐨勫�间负锛歿}", true);
@@ -1875,6 +2273,10 @@
//閫氳繃瀛愪换鍔D鑾峰彇鍒版ā鏉夸俊鎭�
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallReqYQVO.getTaskid()));
+ if (serviceSubtask == null) {
+ log.warn("鍥炶皟瀵瑰簲鐨勫瓙浠诲姟涓嶅瓨鍦紝鐩存帴蹇界暐, taskid={}, operate={}", phoneCallReqYQVO.getTaskid(), phoneCallReqYQVO.getOperate());
+ return phoneCallBackYQVO;
+ }
IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(serviceSubtask.getTemplateid());
//鑾峰彇妯℃澘闂
IvrTaskTemplateScript ivrTaskTemplateScript = new IvrTaskTemplateScript();
@@ -1883,8 +2285,24 @@
//鑾峰彇闂ID 鍜� 搴忓彿
String scriptId = redisCache.getCacheObject(phoneCallReqYQVO.getTaskid().trim() + "-" + phoneCallReqYQVO.getPhone().trim());
log.error("scriptId鏄灏戯細{}", scriptId);
+ if (StringUtils.isEmpty(scriptId)) {
+ //褰撳墠娌℃湁"姝ｅ湪闂殑闂"锛岃鏄庢湰娆￠�氳瘽宸茬粡鏀跺熬锛堢粨鏉熻宸蹭笅鍙戝悗锛屽钩鍙拌繕浼氳ˉ Silent/Asr 鍥炶皟锛夛紝
+ //鍘熸潵杩欓噷鐩存帴 Long.valueOf(null) 浼氭姏 NumberFormatException 璁╁洖璋� 500銆�
+ //杩欓噷鐩存帴蹇界暐锛屽苟纭繚鍏滃簳鎸傛柇宸茬粡鎺掍笂锛岄伩鍏嶇數璇濈户缁寕鐫�銆�
+ log.warn("鏈彇鍒板綋鍓嶉棶棰業D锛屾寜閫氳瘽宸叉敹灏惧鐞�, taskid={}, phone={}, operate={}",
+ phoneCallReqYQVO.getTaskid(), phoneCallReqYQVO.getPhone(), phoneCallReqYQVO.getOperate());
+ if (isDialogueEnded(phoneCallReqYQVO.getUuid())) {
+ scheduleHangupFallback(phoneCallReqYQVO.getUuid(), phoneCallReqYQVO.getPhone(),
+ redisCache.getCacheObject(jsyKey(phoneCallReqYQVO.getUuid())));
+ }
+ return phoneCallBackYQVO;
+ }
//褰撳墠棰樼殑淇℃伅
IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = iIvrTaskTemplateScriptService.getTaskTempScriptInfoByid(Long.valueOf(scriptId));
+ if (ivrTaskTemplateScriptVO == null) {
+ log.warn("褰撳墠闂涓嶅瓨鍦紝蹇界暐鍥炶皟, taskid={}, scriptId={}", phoneCallReqYQVO.getTaskid(), scriptId);
+ return phoneCallBackYQVO;
+ }
//鍒ゆ柇UUID鏄惁瀛樺湪
Boolean aBoolean = redisCache.hasKey(phoneCallReqYQVO.getUuid());
if (!aBoolean) {
@@ -2157,9 +2575,10 @@
redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop");
// //鑾峰彇涓嬩竴棰�
log.error("鑾峰彇涓嬩竴棰樼殑淇℃伅锛歿}", ivrTaskTemplateScriptVO);
- if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1") || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
+ //branchFlag 鍙兘涓� null锛岀粺涓�鎸夊垎鏀�0澶勭悊锛岄伩鍏� NPE 鎶婂洖璋冩墦 500
+ if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
Long nextQuestion = null;
- if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1")) {
+ if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag())) {
nextQuestion = ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().get(j).getNextQuestion();
//鏇存柊鍒嗘暟
double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
@@ -2285,7 +2704,8 @@
if (ObjectUtils.isNotEmpty(countObj)) count = (Integer) countObj;
if (count != null && count >= ivrTaskTemplate.getMateNum()) {
//濡傛灉count宸茬粡澶т簬鎴栫瓑浜庢病鏈夊尮閰嶆鏁�
- if (ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() == 0 || ivrTaskTemplateScriptVO.getBranchFlag().equals("1") && ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getBranchFlag().equals("1") && ivrTaskTemplateScriptVO.getNextScriptno() == 0) {
+ //branchFlag 鍙兘涓� null锛岀粺涓�鎸夊垎鏀�0澶勭悊锛岄伩鍏� NPE 鎶婂洖璋冩墦 500
+ if ("0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() == null || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() == 0 || "1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() == null || "1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() == 0) {
//濡傛灉鏄渶鍚庝竴閬撻锛屾垨鑰呮病鏈変笅涓�棰樹簡锛屽氨鐩存帴鎸傛満
ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
phoneCallBackYQVO.setType("text");
@@ -2715,7 +3135,9 @@
@Override
public Integer recordAccept(PhoneCallRecordVO phoneCallRecordVO) {
Object cacheObject = redisCache.getCacheObject(phoneCallRecordVO.getTaskid() + "recordAccept-hungup");
- if (phoneCallRecordVO.getHangup_cause().equals("NO_USER_RESPONSE") || ObjectUtils.isNotEmpty(cacheObject) && String.valueOf(cacheObject).equals("1")) {
+ // hangup_cause 骞冲彴涓嶄竴瀹氭瘡娆￠兘甯︼紝杩欓噷鍒ょ┖锛岄伩鍏嶆暣鏉￠�氳瘽璁板綍鍥炶皟鐩存帴 NPE 500
+ boolean noUserResponse = "NO_USER_RESPONSE".equals(phoneCallRecordVO.getHangup_cause());
+ if (noUserResponse || ObjectUtils.isNotEmpty(cacheObject) && String.valueOf(cacheObject).equals("1")) {
//鏃犱汉鎺ュ惉
//璁板綍鐢佃瘽鍙戦�佺姸鎬�
ServiceSubtask serviceSubtask = serviceSubtaskMapper.selectServiceSubtaskById(Long.valueOf(phoneCallRecordVO.getTaskid()));
@@ -2728,9 +3150,13 @@
// if (phoneCallRecordVO.getAnswered() != null && phoneCallRecordVO.getAnswered() == true) {
log.error("鏈変汉鎺ョ數璇濅簡锛屽苟涓斿畬浜�");
//璇存槑鏈変汉鎺ヤ簡
- int startIndex = phoneCallRecordVO.getRecord_path().indexOf("voice") + "voice".length() + 1; // 鍔�1鏄烦杩�/绗﹀彿
- int endIndex = phoneCallRecordVO.getRecord_path().lastIndexOf("/");
- String result = phoneCallRecordVO.getRecord_path().substring(startIndex, endIndex);
+ //褰曢煶璺緞鍙仛鏃ュ織鐣欑棔锛氬钩鍙扮粰绌�/鏍煎紡涓嶇鏃跺師鏉ョ殑 substring 浼氭姏寮傚父锛屽鑷存暣鏉″洖璋� 500銆佺姸鎬佸拰褰曢煶閮戒笉澶勭悊
+ String recordPath = phoneCallRecordVO.getRecord_path();
+ if (StringUtils.isNotEmpty(recordPath) && recordPath.contains("voice") && recordPath.lastIndexOf("/") > 0) {
+ log.info("閫氳瘽褰曢煶璺緞, taskid={}, record_path={}", phoneCallRecordVO.getTaskid(), recordPath);
+ } else {
+ log.warn("閫氳瘽璁板綍鍥炶皟鏈彇鍒版湁鏁堝綍闊宠矾寰�, taskid={}, record_path={}", phoneCallRecordVO.getTaskid(), recordPath);
+ }
ServiceSubtask serviceSubtask = new ServiceSubtask();
serviceSubtask.setRemark("鐢佃瘽鎷ㄦ墦宸插畬鎴�");
serviceSubtask.setSendstate(6L);
@@ -2895,7 +3321,7 @@
* @return
*/
@Override
- @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
+// @Cacheable(value = "sfStatistics", key = "T(org.springframework.util.DigestUtils).md5DigestAsHex(#serviceSubtaskCountReq.toString().getBytes())", unless = "#result == null or #result.isEmpty()")
public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
log.info("getSfStatistics鐨勫叆鍙備负锛歿}", serviceSubtaskCountReq);
String drcode = "drcode";
@@ -3017,6 +3443,8 @@
ssRate.setOrgid(serviceSubtaskCountReq.getOrgid());
ssRate.setStarttime(serviceSubtaskCountReq.getStartTime());
ssRate.setEndtime(serviceSubtaskCountReq.getEndTime());
+ ssRate.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
+ ssRate.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
ssRate.setVisitCount(serviceSubtaskCountReq.getVisitCount());
ssRate.setServiceTypeList(serviceSubtaskCountReq.getServiceType());
if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
@@ -3108,6 +3536,8 @@
if (serviceSubtaskCountReq.getEndTime() != null && new Date().before(serviceSubtaskCountReq.getEndTime())) {
ss.setEndtime(new Date());
}
+ ss.setStartOutHospTime(serviceSubtaskCountReq.getHospitalStartTime());
+ ss.setEndOutHospTime(serviceSubtaskCountReq.getHospitalEndTime());
Double jsRate = serviceSubtaskMapper.selectTimelyRate(ss);
statistic.setRate(jsRate);
if (ObjectUtils.isNotEmpty(statistic)) {
@@ -3260,6 +3690,12 @@
//搴旈殢璁夸汉娆�
if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() != 4) {
serviceSubtaskStatistic.setFollowUpNeeded(serviceSubtaskStatistic.getFollowUpNeeded() + 1L);
+ }
+
+ //浜哄伐宸叉嫧閫氭�婚噺
+ if (ObjectUtils.isNotEmpty(serviceSubtask.getIsManuallyCalled())
+ && serviceSubtask.getIsManuallyCalled().equals(1L)) {
+ serviceSubtaskStatistic.setManuallyCalled(serviceSubtaskStatistic.getManuallyCalled() + 1L);
}
//棣栨鍑洪櫌闅忚
@@ -4281,6 +4717,7 @@
* taskSituation4Info - taskSituation = 4
* taskSituation5Info - taskSituation = 5
* taskSituation6Info - taskSituation = 7
+ * manuallyCalledInfo - isManuallyCalled = 1L
* filterCountList - taskSituation = 6 && sendstate = 4
*
*/
@@ -4353,7 +4790,7 @@
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatInfo":
+ case "weChatInfo":
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setCurrentPreachform("5");
break;
@@ -4372,7 +4809,7 @@
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatSuccessInfo":
+ case "weChatSuccessInfo":
serviceSubtaskCountReq.setVisitCount(1);
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("5");
@@ -4409,7 +4846,7 @@
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatAgainInfo":
+ case "weChatAgainInfo":
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setCurrentPreachform("5");
break;
@@ -4428,7 +4865,7 @@
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("4");
break;
- case "wechatAgainSuccessInfo":
+ case "weChatAgainSuccessInfo":
serviceSubtaskCountReq.setVisitCount(2);
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(6L)));
serviceSubtaskCountReq.setCurrentPreachform("5");
@@ -4458,6 +4895,9 @@
case "filterCountList":
serviceSubtaskCountReq.setTaskSituation(6);
serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
+ break;
+ case "manuallyCalledInfo":
+ serviceSubtaskCountReq.setIsManuallyCalled(1L);
break;
default:
break;
@@ -5141,13 +5581,108 @@
}
@Override
- public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType) {
+ public Map<String, Object> weChatSubTask(Long subid) {
+ log.info("smsSubTask鐨勫叆鍙備负锛歿}", subid);
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("code", "500");
+ resultMap.put("msg", "鍙戦�佸け璐�");
+
+ //鑾峰彇鎮ｈ�呯殑鍩烘湰淇℃伅
+ ServiceSubtask serviceSubtask = selectServiceSubtaskById(subid);
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
+ String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
+
+ //涓芥按涓尰闄㈠彂閫佺殑鏄井淇″叕浼楀彿
+ resultMap = wechatSubTask(subid);
+ return resultMap;
+ }
+
+ public Map<String,Object> wechatSubTask(Long subid){
+ log.info("wechatSubTask鐨勫叆鍙備负锛歿}", subid);
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("code", "500");
+ resultMap.put("msg", "鍙戦�佸け璐�");
+ try{
+ //鑾峰彇闅忚鐨勫熀鏈俊鎭�
+ ServiceSubtask serviceSubtask = selectServiceSubtaskById(subid);
+ //鑾峰彇鎮ｈ�呬俊鎭�
+ PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(serviceSubtask.getPatid());
+
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
+ String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
+ String taskId = rsaPublicKeyExample.encryptedData(serviceSubtask.getTaskid().toString(), pub_key);
+ String url = localIP + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid + "¶m3="
+ + URLEncoder.encode(serviceSubtask.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false"
+ + "$param6=" + subId;
+
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
+ serviceOutPath.setParam1(taskId);
+ serviceOutPath.setParam2(patid);
+ serviceOutPath.setParam3(serviceSubtask.getTaskName());
+ serviceOutPath.setParam6(subId);
+ serviceOutPath.setCreateTime(new Date());
+ serviceOutPath.setOrgid(serviceSubtask.getOrgid());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
+ String format = String.format("%03X", serviceOutPath.getId());
+ serviceOutPath.setRadix(format);
+ serviceOutPath.setUpdateTime(new Date());
+ serviceOutPath.setUrl(url);
+ iServiceOutPathService.updateServiceOutPath(serviceOutPath);
+
+
+ //鑾峰彇寰俊鍏紬鍙疯姹備俊鎭牴鎹満鏋処D
+ List<String> wxqqxx = WxGZHEnum.getDescByCode(serviceSubtask.getOrgid());
+ if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
+ resultMap.put("code", -1);
+ resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戣鏈烘瀯鐨勫叕浼楀彿閰嶇疆淇℃伅涓嶅叏锛屾棤娉曢�氳繃鍏紬鍙峰彂閫�");
+ return resultMap;
+ }
+
+ if (StringUtils.isEmpty(serviceSubtask.getPatidHis())) {
+ resultMap.put("code", -1);
+ resultMap.put("message", "鍙戦�佸紓甯革細" + "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�,his绯荤粺鐨勬偅鑰卛d涓虹┖");
+ return resultMap;
+ }
+ String wxCode = "";
+ wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), serviceSubtask.getSendname(), patArchive.getPatidHis(), wxqqxx);
+ Map map = JSONObject.parseObject(wxCode, Map.class);
+ Boolean wxCodeSuccess = false;
+ if (!map.isEmpty() && map.get("succ") != null) {
+ wxCodeSuccess = (boolean) map.get("succ");
+ }
+
+ //鍙戦�佸畬鎴愬悗锛屼慨鏀圭姸鎬�
+ serviceSubtask.setSendstate(3L);
+ if (wxCodeSuccess) {
+ serviceSubtask.setResult("success");
+ resultMap.put("code", "200");
+ resultMap.put("msg", "鍙戦�佹垚鍔�");
+ } else {
+ log.error("銆恠fHandlle銆戝叕浼楀彿鍙戦�佸け璐ワ紝鎮ｈ�呬俊鎭細{}锛岄敊璇俊鎭細{}", serviceSubtask, map.get("msg"));
+ resultMap.put("code", -1);
+ resultMap.put("message", "銆愬叕浼楀彿銆戝叕浼楀彿鍙戦�佸け璐�");
+ return resultMap;
+ }
+ } catch (Exception e) {
+ String guid = UUID.randomUUID().toString();
+ log.error("銆恠fHandlle銆戦暱鏈熶换鍔″叕浼楀彿鍙戦�佸け璐ワ紝鍘熷洜锛歿}锛孏UID锛歿}", e.getMessage(), guid);
+ resultMap.put("code", -1);
+ resultMap.put("message", "銆愬叕浼楀彿銆戦暱鏈熶换鍔″叕浼楀彿鍙戦�佸け璐ワ紝鍘熷洜锛�" + e.getMessage());
+ return resultMap;
+ }
+ return resultMap;
+ }
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statQuestionOption(List<Long> taskIds, Date startFinishTime, Date endFinishTime, Date startOutHospTime, Date endOutHospTime, String scriptContent, Double scoreStart, Double scoreEnd, String valueType, List<Long> subtaskIds) {
//鍏堟竻鐞嗕竴涓嬮噸澶嶆暟鎹�
List<Long> repeatIds = serviceSubtaskDetailMapper.selectRepeatDetailIds();
if (!CollectionUtils.isEmpty(repeatIds)) {
serviceSubtaskDetailMapper.deleteRepeatDetailByIds(repeatIds);
}
- List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType);
+ List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = serviceSubtaskMapper.statQuestionOption(taskIds, startOutHospTime, endOutHospTime, startFinishTime, endFinishTime, scoreStart, scoreEnd, scriptContent, valueType, subtaskIds);
// 澶勭悊 targetvalue锛氭寜 & 鍒嗗壊鎴愬鏉¤褰�
List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
@@ -5157,7 +5692,9 @@
// 濡傛灉鏈夊鏉＄洰鏍囧�硷紝鎷嗗垎鎴愬琛�
for (String value : values) {
//鍏堝幓 result 涓煡涓�涓嬶紝鏈夋病鏈夎繖涓� questiontext 鍜屽搴旂殑 targetvalue
- ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
+ //娉ㄦ剰蹇呴』甯︿笂 taskid 涓�璧峰尮閰嶏細鍚﹀垯浼氭妸鍒殑浠诲姟鐨勬暟鎹～鍒版湰浠诲姟鐨勮涓婏紝
+ //瀵艰嚧瀵煎嚭鐨勩�屾暟閲�/姣斾緥銆嶅拰璇ヨ鐨勩�屼换鍔″悕绉�/浠诲姟缂栧彿銆嶅涓嶄笂锛堝悓涓�浠诲姟鍚屼竴棰樺嚭鐜颁袱涓笉鍚屽垎姣嶏級
+ ServiceSubtaskDetailRatioExport existingExport = result.stream().filter(e -> Objects.equals(e.getTaskid(), export.getTaskid()) && e.getQuestiontext().equals(export.getQuestiontext()) && value.trim().equals(e.getTargetvalue())).findFirst().orElse(null);
if (existingExport != null && existingExport.getRatio().equals("0") && existingExport.getCount().equals("0")) {
//濡傛灉瀛樺湪锛屽垯灏� result 閲岀殑杩欎釜闂鎵�瀵瑰簲鐨� Targetvalue=value 杩欐潯鏁版嵁鏇存柊鎴愬綋鍓嶈繖鏉℃暟鎹�
if (value.equals(export.getOptionresult())) {
@@ -5186,6 +5723,152 @@
}
return result;
+ }
+
+ @Override
+ public List<ServiceSubtaskDetailRatioExport> statMydQuestionOptionForExport(List<Long> subtaskIds, String questiontext) {
+ List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+ if (CollectionUtils.isEmpty(subtaskIds)) {
+ return result;
+ }
+ List<ServiceSubtaskOptionStatDTO> statList = serviceSubtaskMapper.statMydQuestionOptionForExport(subtaskIds, questiontext);
+ if (CollectionUtils.isEmpty(statList)) {
+ return result;
+ }
+ return buildMydOptionRows(statList);
+ }
+
+ /**
+ * 鎶娿�屼换鍔�+棰樼洰+閫夐」銆嶇殑浣滅瓟缁熻鎷兼垚瀵煎嚭鐨勩�岄棶棰樿鎯呭崰姣斻�嶈
+ * <ul>
+ * <li>閫夐」娓呭崟锛氶鐩厤缃繃鐨勯�夐」鍦� targetvalue锛堢敤 & 杩炴帴锛夐噷锛屽叏閮ㄥ垪鍑猴紝娌′汉閫夌殑鏄剧ず 0</li>
+ * <li>鏁伴噺锛氭偅鑰呴�変腑鐨勯�夐」鍦� asrtext 閲岋紙澶氶�夐鏄�孉&B銆嶏級锛屾瘡涓�変腑椤瑰悇璁颁竴娆′汉鏁帮紝涓�涓偅鑰呭彧绠椾竴鏉℃槑缁�</li>
+ * <li>姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屾墍浠ュ崟閫夐鍚勯�夐」鏁伴噺涔嬪拰 = 璇ラ浣滅瓟鎮ｈ�呮暟</li>
+ * <li>鍒嗘暟锛氳閫夐」鏄庣粏鐨� score 涔嬪拰锛涘閫夎鎸夐�変腑椤逛唤鏁板潎鍒嗭紝淇濊瘉鍚勯�夐」鍒嗘暟涔嬪拰 = 鏄庣粏鍒嗘暟涔嬪拰</li>
+ * </ul>
+ */
+ private static List<ServiceSubtaskDetailRatioExport> buildMydOptionRows(List<ServiceSubtaskOptionStatDTO> statList) {
+ List<ServiceSubtaskDetailRatioExport> result = new ArrayList<>();
+
+ // 鎸夈�屼换鍔� + 棰樼洰銆嶅垎缁勶紝淇濇寔 SQL 鐨勯『搴忥紙鍏堥鐩悗浠诲姟锛�
+ Map<String, List<ServiceSubtaskOptionStatDTO>> grouped = new LinkedHashMap<>();
+ for (ServiceSubtaskOptionStatDTO stat : statList) {
+ String key = stat.getTaskid() + "\u0001" + stat.getQuestiontext();
+ grouped.computeIfAbsent(key, k -> new ArrayList<>()).add(stat);
+ }
+
+ for (List<ServiceSubtaskOptionStatDTO> group : grouped.values()) {
+ ServiceSubtaskOptionStatDTO first = group.get(0);
+ // 閫夐」 -> 浜烘暟锛坙ong[1] 渚夸簬绱姞锛夛紝椤哄簭鍗冲嚭鐜伴『搴�
+ Map<String, long[]> countMap = new LinkedHashMap<>();
+ Map<String, BigDecimal> scoreMap = new LinkedHashMap<>();
+
+ for (ServiceSubtaskOptionStatDTO stat : group) {
+ // targetvalue = 鏈鎵�鏈夐�夐」鐨勬竻鍗曪紝娌′汉閫夌殑涔熻鍒楀嚭鏉�
+ List<String> options = splitOptions(stat.getTargetvalue());
+ // asrtext = 鎮ｈ�呭疄闄呴�変腑鐨勯�夐」锛屽閫夐浼氭槸銆岄�変腑椤�1&閫変腑椤�2銆�
+ List<String> chosenOptions = splitOptions(stat.getOptionresult());
+ for (String option : options) {
+ countMap.computeIfAbsent(option, k -> new long[1]);
+ scoreMap.computeIfAbsent(option, k -> BigDecimal.ZERO);
+ }
+
+ long patientCount = stat.getPatientCount() == null ? 0L : stat.getPatientCount();
+ BigDecimal scoreSum = stat.getScoreSum() == null ? BigDecimal.ZERO : stat.getScoreSum();
+
+ if (!chosenOptions.isEmpty()) {
+ BigDecimal[] scoreParts = splitScore(scoreSum, chosenOptions.size());
+ for (int i = 0; i < chosenOptions.size(); i++) {
+ String chosen = chosenOptions.get(i);
+ // 閫変腑鐨勯�夐」鍙兘涓嶅湪閰嶇疆娓呭崟閲岋紙鍘嗗彶鏁版嵁锛夛紝琛ヤ竴琛�
+ countMap.computeIfAbsent(chosen, k -> new long[1]);
+ scoreMap.computeIfAbsent(chosen, k -> BigDecimal.ZERO);
+ countMap.get(chosen)[0] += patientCount;
+ scoreMap.put(chosen, scoreMap.get(chosen).add(scoreParts[i]));
+ }
+ } else if (options.size() == 1) {
+ // 娌℃湁 asrtext锛堟湭绛�/鏃犲簲绛旓級鏃讹紝鍙湁鍞竴閫夐」鎵嶈兘纭畾褰掑睘
+ countMap.get(options.get(0))[0] += patientCount;
+ scoreMap.put(options.get(0), scoreMap.get(options.get(0)).add(scoreSum));
+ }
+ }
+
+ long total = 0L;
+ for (long[] count : countMap.values()) total += count[0];
+
+ for (Map.Entry<String, long[]> entry : countMap.entrySet()) {
+ long count = entry.getValue()[0];
+ ServiceSubtaskDetailRatioExport row = new ServiceSubtaskDetailRatioExport();
+ row.setQuestiontext(first.getQuestiontext());
+ row.setOptionresult(entry.getKey());
+ row.setTargetvalue(entry.getKey());
+ row.setCount(String.valueOf(count));
+ row.setRatio(formatRatio(count, total));
+ row.setScore(formatScore(scoreMap.get(entry.getKey())));
+ row.setTaskname(first.getTaskName());
+ row.setTaskid(first.getTaskid());
+ row.setValueType(first.getValueType());
+ result.add(row);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 鎶婁竴鏉℃槑缁嗙殑鍒嗘暟鎸夐�変腑椤逛唤鏁板潎鍒嗭紝浣欐暟琛ョ粰绗竴涓紝淇濊瘉鍚勪唤涔嬪拰 = 鍘熷垎鏁�
+ */
+ private static BigDecimal[] splitScore(BigDecimal total, int parts) {
+ BigDecimal[] result = new BigDecimal[parts];
+ if (parts <= 0) {
+ return result;
+ }
+ BigDecimal each = total.divide(BigDecimal.valueOf(parts), 2, RoundingMode.HALF_UP);
+ for (int i = 0; i < parts; i++) {
+ result[i] = each;
+ }
+ result[0] = result[0].add(total.subtract(each.multiply(BigDecimal.valueOf(parts))));
+ return result;
+ }
+
+ /**
+ * 鎷嗗垎棰樼洰閰嶇疆鐨勯�夐」锛堝涓�夐」鐢� & 杩炴帴锛夛紝椤哄甫鍘绘帀鍏ㄨ/鍗婅绌虹櫧
+ */
+ private static List<String> splitOptions(String targetvalue) {
+ List<String> options = new ArrayList<>();
+ if (StringUtils.isEmpty(targetvalue)) {
+ return options;
+ }
+ for (String part : targetvalue.split("&")) {
+ String option = trimAll(part);
+ if (StringUtils.isNotEmpty(option) && !options.contains(option)) {
+ options.add(option);
+ }
+ }
+ return options;
+ }
+
+ /**
+ * 姣斾緥锛氭暟閲� / 璇ラ浣滅瓟鎮ｈ�呮暟锛屼繚鐣欎袱浣嶅皬鏁�
+ */
+ private static String formatRatio(long count, long total) {
+ if (total <= 0) {
+ return "0.00%";
+ }
+ return BigDecimal.valueOf(count * 100.0 / total).setScale(2, RoundingMode.HALF_UP).toPlainString() + "%";
+ }
+
+ /**
+ * 鍒嗘暟涔嬪拰锛氬幓鎺夊浣欑殑灏忔暟浣嶏紙0.00 -> 0锛�
+ */
+ private static String formatScore(BigDecimal score) {
+ if (score == null) {
+ return "0";
+ }
+ BigDecimal value = score.stripTrailingZeros();
+ if (value.scale() < 0) {
+ value = value.setScale(0);
+ }
+ return value.toPlainString();
}
/*
@@ -5862,6 +6545,8 @@
String voiceText = phoneCallReqYQVO.getAsrtext();
String questionText = StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext()) ? ivrTaskTemplateScriptVO.getIvrtext() : ivrTaskTemplateScriptVO.getScriptContent();
Integer matched = -1;
+ log.info("AI鍖归厤:url = {},questionText = {},voiceText = {},options = {},uuid ={}",
+ url,questionText,voiceText,options,uuid);
matched = matchOptionIndex(url, questionText, voiceText, options, uuid);
//璇存槑鍖归厤姝ｇ‘浜�
if (matched != null && matched >= 0) {
@@ -5955,7 +6640,8 @@
phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
//璁板綍鐘舵��
setFailPreachForm(serviceSubtask, "3", "鐢佃瘽鎷ㄦ墦宸插畬鎴�", "9");
- return phoneCallBackYQVO;
+ back = phoneCallBackYQVO;
+ return back;
}
flag = 1;
@@ -5963,9 +6649,10 @@
redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "PlayEventCallbackPlaystop");
// //鑾峰彇涓嬩竴棰�
log.error("鑾峰彇涓嬩竴棰樼殑淇℃伅锛歿}", ivrTaskTemplateScriptVO);
- if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1") || ivrTaskTemplateScriptVO.getBranchFlag().equals("0") && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
+ //branchFlag涓簄ull鏃舵寜鍒嗘敮0澶勭悊锛岄伩鍏峃PE
+ if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) && ivrTaskTemplateScriptVO.getNextScriptno() != null && ivrTaskTemplateScriptVO.getNextScriptno() != 0) {
Long nextQuestion = null;
- if (ivrTaskTemplateScriptVO.getBranchFlag().equals("1")) {
+ if ("1".equals(ivrTaskTemplateScriptVO.getBranchFlag())) {
nextQuestion = chosenOption.getNextQuestion();
//鏇存柊鍒嗘暟
double score = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
@@ -5998,15 +6685,9 @@
redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
phoneCallBackYQVO.setType("text");
phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask.getJsy());
- //灏嗙粨鏋滃啓杩沝etail琛�
- ServiceSubTaskDetailReq ssdReq = new ServiceSubTaskDetailReq();
- List<ServiceSubtaskDetail> serviceSubtaskDetailList2 = new ArrayList<>();
- serviceSubtaskDetailList.add(getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate));
- serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList2);
- ssdReq.setGuid(phoneCallReqYQVO.getGuid());
- ssdReq.setOrgid(phoneCallReqYQVO.getOrgid());
- saveQuestionAnswerPhone(ssdReq);
- return phoneCallBackYQVO;
+ //鏄庣粏鍦ㄦ湰棰樺尮閰嶆垚鍔熸椂宸茶惤搴擄紙瑙佷笂鏂� saveQuestionAnswerPhone锛夛紝杩欓噷涓嶅啀閲嶅淇濆瓨
+ back = phoneCallBackYQVO;
+ return back;
}
for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
@@ -6023,6 +6704,15 @@
redisCache.deleteObject(phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid());
}
}
+ //涓嬩竴棰樿剼鏈病鎵惧埌鏃讹紝鍏滃簳閲嶉棶褰撳墠棰橈紝閬垮厤璋冪敤鏂硅鍒や负鏈鐞嗚�岄��鍥炴鍒欒瘑鍒�
+ if (StringUtils.isEmpty(phoneCallBackYQVO.getValue())) {
+ log.error("涓嬩竴棰樿剼鏈湭鎵惧埌锛岄噸闂綋鍓嶉锛宯extQuestion锛歿}", nextQuestion);
+ phoneCallBackYQVO.setType("text");
+ phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+ phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, questionText));
+ }
+ back = phoneCallBackYQVO;
+ return back;
} else if (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0) {
ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
phoneCallBackYQVO.setType("text");
@@ -6051,33 +6741,101 @@
//鍦╮edis涓繚瀛樹竴涓嬬粨鏉熻锛屽湪璋冪敤鎸傜數璇濈殑鏂规硶鏃跺垹闄�
ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
-// return phoneCallBackYQVO;
+ //缁撴潫璇凡鎷艰繘杩斿洖鍊硷紝鎸傛満鐢卞钩鍙版寜杩斿洖鍊兼墽琛�
+ back = phoneCallBackYQVO;
+ return back;
}
} else {
- log.info("娌℃湁鍖归厤涓�----------------------------");
- //flag=0,璇存槑娌� 鍖归厤涓婏紝涔熻鎶婃偅鑰呰鐨勮瘽璁板綍涓嬫潵
- if (matched == ivrTaskTemplateScriptVO.getIvrTaskScriptTargetoptionList().size() - 1 && flag == 0) {
- ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
- List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
- ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
- //淇敼涓�涓嬭闊宠矾寰勶紙鏀规垚鍓嶇鍙互璁块棶鐨勶紝瀛樺埌鏁版嵁搴撲腑锛�
- if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
- String questionvoice = serviceSubtaskDetail.getQuestionvoice();
- String[] split = questionvoice.split("\\\\");
- if (split.length > 0) {
- String lastPart = split[split.length - 1];
- serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
+ //AI娌℃湁鍖归厤涓婏細鐢盇I鍒嗘敮鑷繁鎸�"娌￠棶娓呭氨閲嶉棶"鐨勬鏁板鐞嗭紝涓嶅啀閫�鍥炴鍒欒瘑鍒�
+ log.info("ai娌℃湁鍖归厤涓�----------------------------");
+ //娌″尮閰嶄笂涔熻鎶婃偅鑰呰鐨勮瘽璁板綍涓嬫潵锛坢atchedtext缃┖锛屼笌姝ｅ垯璺緞鍙ｅ緞涓�鑷达級
+ ServiceSubTaskDetailReq serviceSubTaskDetailReq = new ServiceSubTaskDetailReq();
+ List<ServiceSubtaskDetail> serviceSubtaskDetailList = new ArrayList<>();
+ ServiceSubtaskDetail serviceSubtaskDetail = getServiceSubtaskDetail(phoneCallReqYQVO, ivrTaskTemplateScriptVO, serviceSubtask, ivrTaskTemplate);
+ //淇敼涓�涓嬭闊宠矾寰勶紙鏀规垚鍓嶇鍙互璁块棶鐨勶紝瀛樺埌鏁版嵁搴撲腑锛�
+ if (StringUtils.isNotEmpty(serviceSubtaskDetail.getQuestionvoice())) {
+ String questionvoice = serviceSubtaskDetail.getQuestionvoice();
+ String[] split = questionvoice.split("\\\\");
+ if (split.length > 0) {
+ String lastPart = split[split.length - 1];
+ serviceSubtaskDetail.setQuestionvoice(voicePathPrefix + lastPart);
+ }
+ }
+ serviceSubtaskDetailList.add(serviceSubtaskDetail);
+ //濡傛灉娌℃湁 鍖归厤涓婏紝杩欎釜蹇呴』涓簄ull
+ serviceSubtaskDetailList.get(0).setMatchedtext("");
+ serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
+ serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
+ serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
+ saveQuestionAnswerPhone(serviceSubTaskDetailReq);
+
+ String mateKey = phoneCallReqYQVO.getTaskid().trim() + "&&" + "mate" + "&&" + phoneCallReqYQVO.getUuid();
+ Integer count = null;
+ Object countObj = redisCache.getCacheObject(mateKey);
+ if (ObjectUtils.isNotEmpty(countObj)) count = (Integer) countObj;
+ if (count != null && count >= ivrTaskTemplate.getMateNum()) {
+ //娌″尮閰嶆鏁板凡缁忕敤婊★紝涓嶈兘鍐嶉噸闂簡
+ boolean noNextQuestion = ("0".equals(ivrTaskTemplateScriptVO.getBranchFlag()) || "1".equals(ivrTaskTemplateScriptVO.getBranchFlag()))
+ && (ivrTaskTemplateScriptVO.getNextScriptno() == null || ivrTaskTemplateScriptVO.getNextScriptno() == 0);
+ if (noNextQuestion) {
+ //宸茬粡鏄渶鍚庝竴棰橈紝鐩存帴鎸傛満
+ ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ phoneCallBackYQVO.setType("text");
+ phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+ phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + serviceTask1.getJsy());
+ //鏇存柊涓�涓嬪垎鏁�
+ Double score = null;
+ Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
+ if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
+ serviceSubtask.setScore(String.valueOf(score));
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setSendstate(6L);
+ serviceSubtask.setRemark("鐢佃瘽鎷ㄦ墦宸插畬鎴�");
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ //璁板綍鐘舵��
+ setFailPreachForm(serviceSubtask, "3", "鐢佃瘽鎷ㄦ墦宸插畬鎴�", "9");
+ //鍦╮edis涓繚瀛樹竴涓嬬粨鏉熻锛屽湪璋冪敤鎸傜數璇濈殑鏂规硶鏃跺垹闄�
+ ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
+ redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "- jsy", serviceTask.getJsy(), 120, TimeUnit.MINUTES);
+ //鍘籸edis涓紝鎶婅瀛愪换鍔D鍒犻櫎
+ Long id = serviceSubtask.getId();
+ Map<String, String> map = delRedisValue(null, id.toString());
+ if (ObjectUtils.isNotEmpty(map)) {
+ redisCache.setCacheObject(map.get("cacheName"), map.get("val"));
+ redisCache.deleteObject(serviceSubtask.getId() + "-" + serviceSubtask.getPhone());
+ redisCache.deleteObject(phoneCallReqYQVO.getUuid() + "SCORE");
+ }
+ } else {
+ //杩樻湁涓嬩竴棰橈紝鎸塶extScriptno缁х画鎻愰棶
+ for (IvrTaskTemplateScript script : ivrTaskTemplateScripts) {
+ if (script.getSort() == ivrTaskTemplateScriptVO.getNextScriptno().intValue()) {
+ phoneCallBackYQVO.setType("text");
+ phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+ String scriptContent = StringUtils.isNotEmpty(script.getIvrtext()) ? script.getIvrtext() : script.getScriptContent();
+ phoneCallBackYQVO.setValue(phoneCallBackYQVO.getCommonValue() + getObject(serviceSubtask, scriptContent));
+ //灏嗚鎮ｈ�呯殑Redis涓殑棰樼洰ID锛岃繘琛屼慨鏀�
+ redisCache.setCacheObject(phoneCallReqYQVO.getTaskid().trim() + "-" + phoneCallReqYQVO.getPhone().trim(), script.getId().toString(), 120, TimeUnit.MINUTES);
+ //鏇存柊涓�涓嬪垎鏁�
+ Double score = null;
+ Object scoreObj = redisCache.getCacheObject(phoneCallReqYQVO.getUuid() + "SCORE");
+ if (ObjectUtils.isNotEmpty(scoreObj)) score = (Double) scoreObj;
+ score = BigDecimal.valueOf(score).add(new BigDecimal(script.getScore())).doubleValue();
+ redisCache.setCacheObject(phoneCallReqYQVO.getUuid() + "SCORE", score, 120, TimeUnit.MINUTES);
+ //鎹㈤鎴愬姛锛屾病鍖归厤娆℃暟娓呴浂
+ redisCache.deleteObject(mateKey);
+ }
}
}
- serviceSubtaskDetailList.add(serviceSubtaskDetail);
- //濡傛灉娌℃湁 鍖归厤涓婏紝杩欎釜蹇呴』涓簄ull
- serviceSubtaskDetailList.get(0).setMatchedtext("");
- serviceSubTaskDetailReq.setServiceSubtaskDetailList(serviceSubtaskDetailList);
- serviceSubTaskDetailReq.setGuid(phoneCallReqYQVO.getGuid());
- serviceSubTaskDetailReq.setOrgid(phoneCallReqYQVO.getOrgid());
- saveQuestionAnswerPhone(serviceSubTaskDetailReq);
+ } else {
+ //杩樻病闂弧娆℃暟锛岀敤noMatchText寮曞鎮ｈ�呴噸绛�
+ redisCache.setCacheObject(mateKey, count == null ? 1 : count + 1, 120, TimeUnit.MINUTES);
+ phoneCallBackYQVO.setType("text");
+ phoneCallBackYQVO.setSilent_interval(ivrTaskTemplate.getSilencetime().intValue());
+ phoneCallBackYQVO.setValue(ivrTaskTemplateScriptVO.getNoMatchText() + getObject(serviceSubtask, StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIvrtext()) ? ivrTaskTemplateScriptVO.getIvrtext() : ivrTaskTemplateScriptVO.getScriptContent()));
}
+ back = phoneCallBackYQVO;
+ return back;
}
return back;
}
@@ -6092,17 +6850,31 @@
*/
public List<ServiceSubtaskDetailRatioExport> getDetailRatio(SltdMydTotalVO sltdMydTotalVO, List<ServiceSubtaskRes> serviceSubtaskRes) {
List<ServiceSubtaskDetailRatioExport> serviceSubtaskDetailRatioExports = null;
- if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("2") && (sltdMydTotalVO.getServiceTypeList().contains("6") || sltdMydTotalVO.getServiceTypeList().contains("14"))) {
- //serviceType锛屽嵆鏈夐殢璁垮張鏈夋弧鎰忓害锛屾殏鏃舵病娉曠粺璁�
+ List<String> serviceTypeList = sltdMydTotalVO.getServiceTypeList();
+ if (CollectionUtils.isEmpty(serviceTypeList)) {
+ log.warn("getDetailRatio 鏈紶 serviceTypeList锛屾棤娉曠粺璁￠棶棰樺崰姣�");
return serviceSubtaskDetailRatioExports;
- } else if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("2")) {
+ }
+ // 鍒ゆ柇鍙ｅ緞锛�2=闅忚锛堟寜 taskid 缁熻锛夛紝6/14=婊℃剰搴︼紙鎸� subtask id 缁熻锛�
+ boolean hasFollowUp = serviceTypeList.contains("2");
+ boolean hasSatisfaction = serviceTypeList.contains("6") || serviceTypeList.contains("14");
+ if (hasFollowUp && hasSatisfaction) {
+ //serviceType锛屽嵆鏈夐殢璁垮張鏈夋弧鎰忓害锛屾殏鏃舵病娉曠粺璁�
+ log.warn("getDetailRatio 鏆備笉鏀寔鍚屾椂缁熻闅忚(2)涓庢弧鎰忓害(6/14)锛宻erviceTypeList={}", serviceTypeList);
+ return serviceSubtaskDetailRatioExports;
+ }
+ if (hasFollowUp) {
//鑾峰彇serviceSubtaskList涓殑鎵�鏈塼askid
List<Long> taskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getTaskid).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
- serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
- } else if (CollectionUtils.isNotEmpty(sltdMydTotalVO.getServiceTypeList()) && sltdMydTotalVO.getServiceTypeList().contains("6") || sltdMydTotalVO.getServiceTypeList().contains("14")) {
+ //鍚屾椂甯︿笂鏈瀵煎嚭鐨勫瓙浠诲姟 id锛氳銆岄棶棰樿鎯呭崰姣斻�嶅彧缁熻杩欐壒鎮ｈ�咃紝涓庛�屾偅鑰呴殢璁夸俊鎭〃鍗曘�嶅彛寰勪竴鑷�
+ List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).filter(ObjectUtils::isNotEmpty).distinct().collect(Collectors.toList());
+ serviceSubtaskDetailRatioExports = statQuestionOption(taskIds, sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType(), subtaskIds);
+ } else if (hasSatisfaction) {
//婊℃剰搴︾粺璁� 锛堥�氳繃 subtask 鐨� id 鍘荤粺璁★級
List<Long> subtaskIds = serviceSubtaskRes.stream().map(ServiceSubtaskRes::getId).collect(Collectors.toList());
serviceSubtaskDetailRatioExports = statQuestionOptionBySubtaskIds(subtaskIds, sltdMydTotalVO.getStartOutHospTime(), sltdMydTotalVO.getEndOutHospTime(), sltdMydTotalVO.getStartFinishTime(), sltdMydTotalVO.getEndFinishTime(), sltdMydTotalVO.getQuestionContent(), sltdMydTotalVO.getStartScore(), sltdMydTotalVO.getEndScore(), sltdMydTotalVO.getValueType());
+ } else {
+ log.warn("getDetailRatio 鏆備笉鏀寔鐨� serviceTypeList={}锛堜粎鏀寔 2 鎴� 6/14锛�", serviceTypeList);
}
return serviceSubtaskDetailRatioExports;
}
@@ -6433,8 +7205,9 @@
if (StringUtils.isEmpty(mzMydScoreRankVO.getDimensionType())) {
mzMydScoreRankVO.setDimensionType("1");
}
- if (StringUtils.isEmpty(mzMydScoreRankVO.getServiceType())) {
- mzMydScoreRankVO.setServiceType("14");
+ if (CollectionUtils.isEmpty(mzMydScoreRankVO.getServiceTypes())) {
+ List<String> list=new ArrayList<>(Arrays.asList("14"));
+ mzMydScoreRankVO.setServiceTypes(list);
}
List<MzMydScoreRankDTO> list = serviceSubtaskMapper.selectMzMydScoreRank(mzMydScoreRankVO);
if (CollectionUtils.isEmpty(list)) {
@@ -6446,4 +7219,40 @@
}
return list;
}
+
+ private String getWXCode(String idcard, String url, String taskName, String taskDesc, String phone, String setPatientname, String setPatientid, List<String> wxqqxx) {
+ XinHuaWXReq xinHuaWXReq = new XinHuaWXReq();
+ xinHuaWXReq.setIdcard(idcard);
+ xinHuaWXReq.setUrl(url);
+ xinHuaWXReq.setPatientid(setPatientid);
+ xinHuaWXReq.setPatientname(setPatientname);
+ xinHuaWXReq.setMobile(phone);
+ xinHuaWXReq.setMedcardno(null);
+ xinHuaWXReq.setTitlename(taskName);
+ xinHuaWXReq.setContent(taskDesc);
+ xinHuaWXReq.setAppid(wxqqxx.get(1));
+ log.info("銆恎etWXCode銆戝井淇″叕浼楀彿璇锋眰鍙傛暟锛歿}", xinHuaWXReq);
+ String body = new Gson().toJson(xinHuaWXReq);
+ String encode = encode(wxqqxx.get(2).concat(body));
+ Map<String, String> headerMap = new HashMap<>();
+ headerMap.put("sign", encode);
+ String result = HttpUtils.sendPostByHeader(wxqqxx.get(3), body, headerMap);
+ log.info("銆恎etWXCode銆戝井淇″叕浼楀彿杩斿洖鍙傛暟锛歿}", result);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ String code = (String) jsonObject.toString();
+ return code;
+ }
+ public String encode(String arg) {
+ if (arg == null) {
+ arg = "";
+ }
+ MessageDigest md5 = null;
+ try {
+ md5 = MessageDigest.getInstance("MD5");
+ md5.update(arg.getBytes("UTF-8"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return toHex(md5.digest());
+ }
}
--
Gitblit v1.9.3