From 8107dedd85ceec29491293d8ebf69f7d7213aa6b Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 21 九月 2026 15:24:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 397 ++++++++++++++++++++++++++++----------------------------
1 files changed, 199 insertions(+), 198 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 12c3f7e..458452d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -168,7 +168,7 @@
* 淇濆瓨闂嵎绛旀 (寮傛澶勭悊锛屽揩閫熻繑鍥�)
*
* @param serviceSubTaskAnswerReq 绛旀璇锋眰
- * @param flag 鏍囧織浣�
+ * @param flag 鏍囧織浣�
* @return 缁撴灉
*/
@Override
@@ -177,239 +177,240 @@
String threadName = Thread.currentThread().getName();
log.info("[{}] 寮�濮嬪紓姝ュ鐞嗕繚瀛橀棶鍗风瓟妗�", threadName);
try {
- //鍙傛暟瑙ｅ瘑
- Long tid = null;
- Long pid = null;
- Long subid = null;
- if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
- RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ //鍙傛暟瑙ｅ瘑
+ Long tid = null;
+ Long pid = null;
+ Long subid = null;
+ if (ObjectUtils.isNotEmpty(serviceSubTaskAnswerReq)) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
- if (flag == 0) {
- tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
- pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
- if (StringUtils.isNotEmpty(serviceSubTaskAnswerReq.getParam6()))
- subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key));
- } else if (flag == 1) {
- tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1());
- pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2());
- subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6());
+ if (flag == 0) {
+ tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
+ pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+ if (StringUtils.isNotEmpty(serviceSubTaskAnswerReq.getParam6()))
+ subid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam6(), pri_key));
+ } else if (flag == 1) {
+ tid = Long.valueOf(serviceSubTaskAnswerReq.getParam1());
+ pid = Long.valueOf(serviceSubTaskAnswerReq.getParam2());
+ subid = Long.valueOf(serviceSubTaskAnswerReq.getParam6());
+ }
}
- }
- //鏍规嵁 PID銆乀ID銆丼UBID 鏋勫缓闇�瑕佸鐞嗙殑 cache key
- String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
- Set<String> targetKeys = new HashSet<>();
+ //鏍规嵁 PID銆乀ID銆丼UBID 鏋勫缓闇�瑕佸鐞嗙殑 cache key
+ String scriptCacheKeyPrefix = pid + "-" + tid + "-" + subid;
+ Set<String> targetKeys = new HashSet<>();
- if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
- if (serviceSubTaskAnswerReq.getType() == 2) {
- targetKeys.add(scriptCacheKeyPrefix + "-WJscriptCache");
- } else if (serviceSubTaskAnswerReq.getType() == 1) {
- targetKeys.add(scriptCacheKeyPrefix + "-SFscriptCache");
+ if (serviceSubTaskAnswerReq != null && serviceSubTaskAnswerReq.getType() != null) {
+ if (serviceSubTaskAnswerReq.getType() == 2) {
+ targetKeys.add(scriptCacheKeyPrefix + "-WJscriptCache");
+ } else if (serviceSubTaskAnswerReq.getType() == 1) {
+ targetKeys.add(scriptCacheKeyPrefix + "-SFscriptCache");
+ }
+ } else {
+ //濡傛灉娌℃湁 type锛屽垯閬嶅巻鎵�鏈� key锛堜繚鐣欏師鏈夊吋瀹规�э級
+ Set<String> allKeys = redisCache.getAllKeys();
+ for (String key : allKeys) {
+ try {
+ if (key.contains(scriptCacheKeyPrefix) && (key.endsWith("-WJscriptCache") || key.endsWith("-SFscriptCache"))) {
+ targetKeys.add(key);
+ }
+ } catch (Exception e) {
+ continue;
+ }
+ }
}
- } else {
- //濡傛灉娌℃湁 type锛屽垯閬嶅巻鎵�鏈� key锛堜繚鐣欏師鏈夊吋瀹规�э級
- Set<String> allKeys = redisCache.getAllKeys();
- for (String key : allKeys) {
+
+ //鐢ㄤ簬鎵归噺鏇存柊鐨勫瓙浠诲姟鍒楄〃锛堥伩鍏嶅湪寰幆涓噸澶嶆煡璇級
+ Map<String, ServiceSubtask> subtaskCache = new HashMap<>();
+ String subtaskCacheKey = subid != null ? subid.toString() : pid + "-" + tid;
+
+ //鍏堟煡璇竴娆″瓙浠诲姟淇℃伅
+ ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
+ if (subid != null) {
+ ssVO.setSubId(subid);
+ } else {
+ ssVO.setTaskid(tid);
+ ssVO.setPatid(pid);
+ }
+ List<ServiceSubtask> initialSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
+ if (CollectionUtils.isNotEmpty(initialSubtaskList)) {
+ subtaskCache.put(subtaskCacheKey, initialSubtaskList.get(0));
+ }
+
+ String score = "0";
+ Long nextScriptno = null;
+ aa:
+ for (String key : targetKeys) {
+ String[] split = key.split("-");
+ //鍏堝垽鏂紝鏄笉鏄綋鍓嶆彁浜や汉鐨勶紝涓嶆槸褰撳墠鎻愪氦浜虹殑锛岃烦杩�
try {
- if (key.contains(scriptCacheKeyPrefix) && (key.endsWith("-WJscriptCache") || key.endsWith("-SFscriptCache"))) {
- targetKeys.add(key);
+ if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Objects.isNull(split[2]) && !Long.valueOf(split[2]).equals(subid)) {
+ continue;
}
} catch (Exception e) {
+ //杩欓噷涔嬫墍浠ヨ澶勭悊寮傚父锛屾槸鍥犱负鏈夌殑KEY灏变笉鏄垜浠鐨凨EY,娌℃湁鍘绘埅鍙栵紱鏈夊紓甯镐笉澶勭悊锛岀洿鎺ヤ笅涓�涓�
continue;
}
- }
- }
+ if (key.contains("-WJscriptCache")) {
+ List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+ cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
+ log.info("闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
- //鐢ㄤ簬鎵归噺鏇存柊鐨勫瓙浠诲姟鍒楄〃锛堥伩鍏嶅湪寰幆涓噸澶嶆煡璇級
- Map<String, ServiceSubtask> subtaskCache = new HashMap<>();
- String subtaskCacheKey = subid != null ? subid.toString() : pid + "-" + tid;
+ //鏍￠獙涓�涓嬮鐨勫簭鍙锋槸鍚︽湁闂 (濡傛灉鏍规嵁閫夐」鏃犲簭璺宠浆锛屽氨浼氬鑷撮敊璇�)
+ cacheList = checkQuestionSort(cacheList);
- //鍏堟煡璇竴娆″瓙浠诲姟淇℃伅
- ServiceSubtaskEntity ssVO = new ServiceSubtaskEntity();
- if (subid != null) {
- ssVO.setSubId(subid);
- } else {
- ssVO.setTaskid(tid);
- ssVO.setPatid(pid);
- }
- List<ServiceSubtask> initialSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(ssVO);
- if (CollectionUtils.isNotEmpty(initialSubtaskList)) {
- subtaskCache.put(subtaskCacheKey, initialSubtaskList.get(0));
- }
+ for (int i = 0; i < cacheList.size(); i++) {
+ if (i == 0) {
+ //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
+ for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
+ if (svyTaskTemplateScriptVO.getSort() == 1L) {
+ //璇存槑鏄涓�棰�
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
+ if (map == null) continue aa;
+ if (!Objects.isNull(map.get("nextScriptNo")))
+ nextScriptno = Long.valueOf(map.get("nextScriptNo"));
+ if (score == null || score.isEmpty()) {
+ score = map.get("score");
+ } else {
+ score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
+ }
+ }
+ }
- String score = "0";
- Long nextScriptno = null;
- aa:
- for (String key : targetKeys) {
- String[] split = key.split("-");
- //鍏堝垽鏂紝鏄笉鏄綋鍓嶆彁浜や汉鐨勶紝涓嶆槸褰撳墠鎻愪氦浜虹殑锛岃烦杩�
- try {
- if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && !Long.valueOf(split[0]).equals(pid) && !Long.valueOf(split[1]).equals(tid) && !Objects.isNull(split[2]) && !Long.valueOf(split[2]).equals(subid)) {
- continue;
- }
- } catch (Exception e) {
- //杩欓噷涔嬫墍浠ヨ澶勭悊寮傚父锛屾槸鍥犱负鏈夌殑KEY灏变笉鏄垜浠鐨凨EY,娌℃湁鍘绘埅鍙栵紱鏈夊紓甯镐笉澶勭悊锛岀洿鎺ヤ笅涓�涓�
- continue;
- }
- if (key.contains("-WJscriptCache")) {
- List<SvyTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
- cacheList.sort(Comparator.comparingLong(SvyTaskTemplateScriptVO::getSort));
- log.info("闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
+ } else {
+ SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
+ log.info("svyTaskTemplateScriptVO鐨勪俊鎭负锛歿}锛宨鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getScriptno(), i);
+ List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
+ svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- //鏍￠獙涓�涓嬮鐨勫簭鍙锋槸鍚︽湁闂 (濡傛灉鏍规嵁閫夐」鏃犲簭璺宠浆锛屽氨浼氬鑷撮敊璇�)
- cacheList = checkQuestionSort(cacheList);
-
- for (int i = 0; i < cacheList.size(); i++) {
- if (i == 0) {
- //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
- for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : cacheList) {
- if (svyTaskTemplateScriptVO.getSort() == 1L) {
- //璇存槑鏄涓�棰�
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(0).getSvyTaskTemplateTargetoptions();
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, tid, pid, subid);
- if (map == null) continue aa;
+ if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
+ Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
+ log.error("nextScriptNo鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
- if (score == null || score.isEmpty()) {
+ if (score == null) {
score = map.get("score");
} else {
score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
}
}
}
-
- } else {
- SvyTaskTemplateScriptVO svyTaskTemplateScriptVO = cacheList.get(i);
- log.info("svyTaskTemplateScriptVO鐨勪俊鎭负锛歿}锛宨鐨勫�间负锛歿}", svyTaskTemplateScriptVO.getScriptno(), i);
- List<SvyTaskTemplateTargetoption> svyTaskTemplateTargetoptions = cacheList.get(i).getSvyTaskTemplateTargetoptions();
- svyTaskTemplateScriptVO.setSvyTaskTemplateTargetoptions(svyTaskTemplateTargetoptions);
-
- if (svyTaskTemplateScriptVO.getSort() != null && svyTaskTemplateScriptVO.getSort().equals(nextScriptno)) {
- Map<String, String> map = setWJInfo(svyTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
- log.error("nextScriptNo鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
- if (!Objects.isNull(map.get("nextScriptNo")))
- nextScriptno = Long.valueOf(map.get("nextScriptNo"));
- if (score == null) {
- score = map.get("score");
- } else {
- score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
- }
- }
}
- }
- } else if (key.contains("-SFscriptCache")) {
- List<IvrTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
- cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
- log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
- for (int i = 0; i < cacheList.size(); i++) {
- if (i == 0) {
- //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
- for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
- if (ivrTaskTemplateScriptVO.getSort() == 1L) {
- //璇存槑鏄涓�棰�
- List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
- ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
+ } else if (key.contains("-SFscriptCache")) {
+ List<IvrTaskTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+ cacheList.sort(Comparator.comparingLong(IvrTaskTemplateScriptVO::getSort));
+ log.error("鐢佃瘽闅忚闂嵎鍥炵瓟缁撴灉锛歿}", CollectionUtils.isEmpty(cacheList) ? null : cacheList.size());
+ for (int i = 0; i < cacheList.size(); i++) {
+ if (i == 0) {
+ //杩欎釜鏃堕棿瑕佹壘鍒扮涓�棰�
+ for (IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO : cacheList) {
+ if (ivrTaskTemplateScriptVO.getSort() == 1L) {
+ //璇存槑鏄涓�棰�
+ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = cacheList.get(0).getIvrTaskScriptTargetoptionList();
+ ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, tid, pid, subid);
+ if (!Objects.isNull(map.get("nextScriptNo")))
+ nextScriptno = Long.valueOf(map.get("nextScriptNo"));
+ if (score == null || score.isEmpty()) {
+ score = map.get("score");
+ } else {
+ score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
+ }
+ }
+ }
+
+ } else {
+ IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
+ List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
+ ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
+
+ if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
+ Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
+ log.error("----nextScriptNo2鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
if (!Objects.isNull(map.get("nextScriptNo")))
nextScriptno = Long.valueOf(map.get("nextScriptNo"));
- if (score == null || score.isEmpty()) {
+ if (score == null) {
score = map.get("score");
} else {
score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
}
}
}
-
- } else {
- IvrTaskTemplateScriptVO ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(cacheList.get(i), IvrTaskTemplateScriptVO.class);
- List<IvrTaskTemplateTargetoption> ivrTaskTemplateTargetoptions = DtoConversionUtils.sourceToTarget(cacheList.get(i).getIvrTaskScriptTargetoptionList(), IvrTaskTemplateTargetoption.class);
- ivrTaskTemplateScriptVO.setIvrTaskScriptTargetoptionList(ivrTaskTemplateTargetoptions);
-
- if (ivrTaskTemplateScriptVO.getSort() != null && Long.valueOf(ivrTaskTemplateScriptVO.getSort()).equals(nextScriptno)) {
- Map<String, String> map = setSFInfo(ivrTaskTemplateScriptVO, Long.valueOf(split[1]), Long.valueOf(split[0]), Objects.isNull(split[2]) ? null : Long.valueOf(split[2]));
- log.error("----nextScriptNo2鐨勪俊鎭负锛歿}", map.get("nextScriptNo"));
- if (!Objects.isNull(map.get("nextScriptNo")))
- nextScriptno = Long.valueOf(map.get("nextScriptNo"));
- if (score == null) {
- score = map.get("score");
- } else {
- score = String.valueOf(Double.parseDouble(score) + Double.parseDouble(map.get("score")));
- }
- }
}
- }
- } else {
- continue;
- }
- //灏嗚 key 鍜� value 浠� redis 涓紝鍒犻櫎
- redisCache.deleteObject(key);
-
- //鏌ヨ鍑鸿浠诲姟涓鍦ㄦ墽琛岀殑鎮ｈ�呬俊鎭紙浣跨敤缂撳瓨锛�
- String currentSubtaskKey = subid != null ? subid.toString() : pid + "-" + tid;
- ServiceSubtask serviceSubtask;
-
- if (!subtaskCache.containsKey(currentSubtaskKey)) {
- ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
- if (subid != null) {
- serviceSubtaskEntity.setSubId(subid);
} else {
- serviceSubtaskEntity.setTaskid(tid);
- serviceSubtaskEntity.setPatid(pid);
+ continue;
}
+ //灏嗚 key 鍜� value 浠� redis 涓紝鍒犻櫎
+ redisCache.deleteObject(key);
+
+ //鏌ヨ鍑鸿浠诲姟涓鍦ㄦ墽琛岀殑鎮ｈ�呬俊鎭紙浣跨敤缂撳瓨锛�
+ String currentSubtaskKey = subid != null ? subid.toString() : pid + "-" + tid;
+ ServiceSubtask serviceSubtask;
+
+ if (!subtaskCache.containsKey(currentSubtaskKey)) {
+ ServiceSubtaskEntity serviceSubtaskEntity = new ServiceSubtaskEntity();
+ if (subid != null) {
+ serviceSubtaskEntity.setSubId(subid);
+ } else {
+ serviceSubtaskEntity.setTaskid(tid);
+ serviceSubtaskEntity.setPatid(pid);
+ }
// ssVO.setSendstate(3L);
- List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
- if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
- serviceSubtask = serviceSubtaskList.get(0);
- subtaskCache.put(currentSubtaskKey, serviceSubtask);
+ List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskEntity);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskList)) {
+ serviceSubtask = serviceSubtaskList.get(0);
+ subtaskCache.put(currentSubtaskKey, serviceSubtask);
+ } else {
+ continue;
+ }
} else {
- continue;
+ serviceSubtask = subtaskCache.get(currentSubtaskKey);
}
- } else {
- serviceSubtask = subtaskCache.get(currentSubtaskKey);
- }
- serviceSubtask.setIsabnormal(serviceSubTaskAnswerReq.getIsabnormal());
- serviceSubtask.setSendstate(6L);
- serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
- serviceSubtask.setFinishtime(new Date());
- serviceSubtask.setUpdateTime(new Date());
- log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
- if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
- serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+ serviceSubtask.setIsabnormal(serviceSubTaskAnswerReq.getIsabnormal());
+ serviceSubtask.setSendstate(6L);
+ serviceSubtask.setExcep(serviceSubTaskAnswerReq.getExcep());
+ serviceSubtask.setFinishtime(new Date());
+ serviceSubtask.setUpdateTime(new Date());
+ log.error("灏嗚key鍜寁alue浠巖edis涓�,serviceSubtask鐨勫�间负--------锛歿}", serviceSubtask);
+ if (score != null && !score.isEmpty()) serviceSubtask.setScore(score);
+ serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
- //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴� 9 瀹屾垚锛堢紦瀛� preachform 鏌ヨ锛�
- String currentPreachform = serviceSubtask.getCurrentPreachform();
- if (StringUtils.isNotEmpty(currentPreachform)) {
- ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
- serviceSubtaskPreachform.setPreachform(currentPreachform);
- if (subid != null) {
- serviceSubtaskPreachform.setSubid(subid);
- } else {
- Long id = serviceSubtask.getId();
- Long tid_ = serviceSubtask.getTaskid();
- if (id != null) {
- serviceSubtaskPreachform.setSubid(id);
- } else if (tid_ != null) {
- serviceSubtaskPreachform.setTaskid(tid_);
+ //灏嗗綋鍓嶅彂閫佺姸鎬佹敼鎴� 9 瀹屾垚锛堢紦瀛� preachform 鏌ヨ锛�
+ String currentPreachform = serviceSubtask.getCurrentPreachform();
+ if (StringUtils.isNotEmpty(currentPreachform)) {
+ ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
+ serviceSubtaskPreachform.setPreachform(currentPreachform);
+ if (subid != null) {
+ serviceSubtaskPreachform.setSubid(subid);
+ } else {
+ Long id = serviceSubtask.getId();
+ Long tid_ = serviceSubtask.getTaskid();
+ if (id != null) {
+ serviceSubtaskPreachform.setSubid(id);
+ } else if (tid_ != null) {
+ serviceSubtaskPreachform.setTaskid(tid_);
+ }
+ }
+ List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
+ if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
+ ServiceSubtaskPreachform ssp = serviceSubtaskPreachforms.get(0);
+ ssp.setSendstate("9");
+ serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(ssp);
}
}
- List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
- ServiceSubtaskPreachform ssp = serviceSubtaskPreachforms.get(0);
- ssp.setSendstate("9");
- serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(ssp);
- }
- }
+ }
+ log.info("[{}] 瀹屾垚寮傛澶勭悊淇濆瓨闂嵎绛旀", Thread.currentThread().getName());
+ return 1;
+ } catch (Exception e) {
+ log.error("[{}] 寮傛澶勭悊淇濆瓨闂嵎绛旀鍙戠敓寮傚父 : {},璇锋眰鐨勫璞′负锛歿}", Thread.currentThread().getName(), e.getMessage(), e, serviceSubTaskAnswerReq);
+ throw new RuntimeException("淇濆瓨闂嵎绛旀澶辫触", e);
}
- log.info("[{}] 瀹屾垚寮傛澶勭悊淇濆瓨闂嵎绛旀", Thread.currentThread().getName());
- return 1;
- } catch (Exception e) {
- log.error("[{}] 寮傛澶勭悊淇濆瓨闂嵎绛旀鍙戠敓寮傚父 : {},璇锋眰鐨勫璞′负锛歿}", Thread.currentThread().getName(), e.getMessage(), e,serviceSubTaskAnswerReq);
- throw new RuntimeException("淇濆瓨闂嵎绛旀澶辫触", e);
}
-}
+
@Override
public Integer saveQuestionDetail(ServiceSubTaskCacheReq serviceSubTaskCacheReq, Long flag) {
Long tid = Long.valueOf(serviceSubTaskCacheReq.getParam1());
@@ -1019,6 +1020,8 @@
serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
serviceSubtaskDetailVO.setIsMydException(svyTaskTemplateScriptVO.getIsMydException());
serviceSubtaskDetailVO.setDimension(svyTaskTemplateScriptVO.getDimension());
+ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScore()))
+ serviceSubtaskDetailVO.setScore(svyTaskTemplateScriptVO.getScore().replaceFirst("^0+(?!$)", ""));
serviceSubtaskDetailVO.setCategoryid(svyTaskTemplateScriptVO.getCategoryid());
serviceSubtaskDetailVO.setTaskid(Long.valueOf(taskid));
serviceSubtaskDetailVO.setTargetid(svyTaskTemplateScriptVO.getTargetid() != null ? svyTaskTemplateScriptVO.getTargetid().intValue() : null);
@@ -1069,16 +1072,15 @@
String orgid = selectServiceSubtaskList.get(0).getOrgid();
//鏅畞-闅忚寮傚父鎻愮ず 鍏朵粬-寮傚父婊℃剰搴︽彁绀�
boolean addTrace = false;
- if(StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")){
+ if (StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")) {
if (stt != null) {
addTrace = Long.valueOf(1L).equals(stt.getIsabnormal());
}
- }else {
+ } else {
addTrace = StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getIsMydException());
}
//鍒ゆ柇涓�涓嬪綋鍓嶇殑闂鏄笉鏄弧鎰忓害闂锛屽苟涓� dutyDeptCode 鏄惁鏈夊�硷紝骞朵笖閫夐」鏄笉鏄紓甯搁�夐」锛屽鏋滃叏绗﹀悎锛屽垯寰�婊℃剰搴﹂棶棰樺紓甯歌〃鏂板
- if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && Long.valueOf(1L).equals(stt.getIsabnormal()) || StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode())
- && addTrace) {
+ if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && stt != null && Long.valueOf(1L).equals(stt.getIsabnormal()) || StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getDutyDeptCode()) && addTrace) {
isabnormalFlag = 1L;
ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
@@ -1357,16 +1359,15 @@
String orgid = selectServiceSubtaskList.get(0).getOrgid();
//鏅畞-闅忚寮傚父鎻愮ず 鍏朵粬-寮傚父婊℃剰搴︽彁绀�
boolean addTrace = false;
- if(StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")){
+ if (StringUtils.isNotEmpty(orgid) && orgid.equals("47255004333112711A1001")) {
if (stt != null) {
addTrace = Long.valueOf(1L).equals(stt.getIsabnormal());
}
- }else {
+ } else {
addTrace = StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getIsMydException());
}
//鍒ゆ柇涓�涓嬪綋鍓嶇殑闂鏄笉鏄弧鎰忓害闂锛屽苟涓攄utyDeptCode鏄惁鏈夊�硷紝骞朵笖閫夐」鏄笉鏄紓甯搁�夐」锛屽鏋滃叏绗﹀悎锛屽垯寰�婊℃剰搴﹂棶棰樺紓甯歌〃鏂板
- if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal() || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode())
- && addTrace) {
+ if (StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && 1 == stt.getIsabnormal() || StringUtils.isNotEmpty(ivrTaskTemplateScriptVO.getDutyDeptCode()) && addTrace) {
isabnormalFlag = "1";
ServiceSubtaskDetailTrace subtaskDetailTrace = new ServiceSubtaskDetailTrace();
subtaskDetailTrace.setDetailId(serviceSubtaskDetail.getId());
--
Gitblit v1.9.3