From 1cff3842cca26d770bdba4f8fd2143742342b093 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 七月 2024 17:40:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/resources/application-druid.yml | 6 +++---
smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java | 1 -
smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java | 2 +-
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 15 +++++++++------
smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml | 2 +-
smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml | 4 ++--
7 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
index abf1f27..8ffedc5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.ServiceSubTaskAnswerReq;
import com.smartor.domain.ServiceSubTaskCacheReq;
-import com.smartor.domain.ServiceSubTaskDetailReq;
import com.smartor.domain.ServiceSubtaskAnswer;
import com.smartor.service.IServiceSubtaskAnswerService;
import io.swagger.annotations.Api;
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index a5dcce7..1945ae3 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -12,9 +12,9 @@
# password: 123456
# 鍏徃
- url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: hxsoft
- password: Hxerp2000
+ url: jdbc:mysql://192.168.1.16:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: Smartor.2023
driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
slave:
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
index c141506..e48460d 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskAnswerReq.java
@@ -12,7 +12,7 @@
* @author ls
* @date 2023-06-05
*/
-@ApiModel(value = "ServiceSubTaskDetailReq", description = "闂鍥炵瓟鏄庣粏")
+@ApiModel(value = "ServiceSubTaskAnswerReq", description = "闂鍥炵瓟鏄庣粏")
@Data
public class ServiceSubTaskAnswerReq {
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java
index fb719ba..1abf24c 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskCacheReq.java
@@ -12,7 +12,7 @@
* @author ls
* @date 2023-06-05
*/
-@ApiModel(value = "ServiceSubTaskDetailReq", description = "闂鍥炵瓟鏄庣粏")
+@ApiModel(value = "ServiceSubTaskCacheReq", description = "闂鍥炵瓟鏄庣粏")
@Data
public class ServiceSubTaskCacheReq {
@@ -22,10 +22,10 @@
@ApiModelProperty(value = "鎮ｈ�匢D")
private String param2;
- @ApiModelProperty(value = "闂鍥炵瓟鏄庣粏")
+ @ApiModelProperty(value = "闂鍥炵瓟鏄庣粏(闅忚)")
private List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList;
- @ApiModelProperty(value = "闂鍥炵瓟鏄庣粏")
+ @ApiModelProperty(value = "闂鍥炵瓟鏄庣粏(闂嵎)")
List<SvyLibTemplateScriptVO> svyLibTemplateScriptVOList;
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index bf0c347..908e483 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -117,11 +117,14 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam1(), pri_key));
Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceSubTaskAnswerReq.getParam2(), pri_key));
+
allKeys = new HashSet<>();
if (serviceSubTaskAnswerReq.getType() == 1) {
- allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-SFscriptCache"));
+// allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-SFscriptCache"));
+ allKeys.add(pid + "-" + tid + "-SFscriptCache");
} else if (serviceSubTaskAnswerReq.getType() == 2) {
- allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-WJscriptCache"));
+// allKeys.add(redisCache.getCacheObject(pid + "-" + tid + "-WJscriptCache"));
+ allKeys.add(pid + "-" + tid + "-WJscriptCache");
}
}
@@ -130,7 +133,7 @@
String[] split = key.split("-");
if (key.contains("-SFscriptCache")) {
//鍖呭惈浜�,璇存槑浜嗘槸闅忚闂
- List<IvrLibaTemplateScriptVO> cacheList = redisCache.getCacheList(key);
+ List<IvrLibaTemplateScriptVO> cacheList = redisCache.getCacheObject(key);
for (int i = 0; i < cacheList.size(); i++) {
if (i == 0) {
// 璇存槑鏄涓�棰�
@@ -199,7 +202,7 @@
private void setSFInfo(IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO, Long taskid, Long patid) {
ServiceSubtaskAnswer serviceSubtaskAnswer = null;
String dx = "";
- if (ivrLibaTemplateScriptVO.getScriptType().equals("1") || ivrLibaTemplateScriptVO.getScriptType().equals("2")) {
+ if (StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptType()) && ivrLibaTemplateScriptVO.getScriptType().equals("1") || StringUtils.isNotEmpty(ivrLibaTemplateScriptVO.getScriptType()) && ivrLibaTemplateScriptVO.getScriptType().equals("2")) {
//1銆�2涓哄崟閫夋垨澶氶��
for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption : ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList()) {
//鑾峰彇鐢ㄦ埛閫変腑鐨勯�夐」鍙�
@@ -211,8 +214,8 @@
dx = ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList().get(0).getAppenddesc();
}
}
- serviceSubtaskAnswer.setTaskid(Long.valueOf(taskid));
- serviceSubtaskAnswer.setPatId(Long.valueOf(patid));
+ serviceSubtaskAnswer.setTaskid(taskid);
+ serviceSubtaskAnswer.setPatId(patid);
serviceSubtaskAnswer.setScriptid(ivrLibaTemplateScriptVO.getId());
serviceSubtaskAnswer.setScriptType(Long.valueOf(ivrLibaTemplateScriptVO.getScriptType()));
serviceSubtaskAnswer.setAnswer(dx.substring(1));
diff --git a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
index 9148cff..dd1592a 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrTaskTemplateScriptMapper.xml
@@ -43,7 +43,7 @@
</resultMap>
<sql id="selectIvrTaskTemplateScriptVo">
- select ID, taskid,branch_flag,branch_nextscriptno, templateID, questionPoint, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, categoryName, targetOptions, language, playWavOnly, value_type, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, targettype, targetid, targetvalue, otherdata, is_must, question_result from ivr_task_template_script
+ select id, taskid,branch_flag,branch_nextscriptno, templateID, questionPoint, noMatchText, noMatchVoice, slienceText, slienceVoice, submoduleText, submoduleVoice, noClearlyText, noClearlyVoice, categoryName, targetOptions, language, playWavOnly, value_type, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, targettype, targetid, targetvalue, otherdata, is_must, question_result from ivr_task_template_script
</sql>
<select id="selectIvrTaskTemplateScriptList" parameterType="com.smartor.domain.IvrTaskTemplateScript" resultMap="IvrTaskTemplateScriptResult">
@@ -87,7 +87,7 @@
where id = #{id}
</select>
- <insert id="insertIvrTaskTemplateScript" parameterType="com.smartor.domain.IvrTaskTemplateScript" useGeneratedKeys="true" keyProperty="ID">
+ <insert id="insertIvrTaskTemplateScript" parameterType="com.smartor.domain.IvrTaskTemplateScript" useGeneratedKeys="true" keyProperty="id">
insert into ivr_task_template_script
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskid != null">taskid,</if>
diff --git a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
index 6fdf155..4ba8924 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -108,7 +108,7 @@
b.icd10name
FROM
svy_lib_template a
- JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
+ LEFT JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
icd10_association group by outid) b ON a.del_flag = 0
AND a.svyid = b.outid
<where>
--
Gitblit v1.9.3