ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@
    druid:
      # 主库数据源
      master:
        #    义乌二院
        #        义乌二院
        #        url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: root
        #        password: 123456
@@ -34,7 +34,7 @@
        #        password: Hxerp2000
        #        driverClassName: com.mysql.cj.jdbc.Driver
        #  公司本地
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/smartor_lishui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&connectTimeout=120000&socketTimeout=240000
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
@@ -78,7 +78,11 @@
      # 最大连接池数量
      maxActive: 20
      # 配置获取连接等待超时的时间
      maxWait: 60000
      maxWait: 120000
      # 配置连接超时时间（毫秒），防止慢查询导致连接断开
      queryTimeout: 120
      # 配置连接有效性检测超时
      validationQueryTimeout: 5
      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
      timeBetweenEvictionRunsMillis: 60000
      # 配置一个连接在池中最小生存的时间，单位是毫秒
@@ -105,8 +109,8 @@
        stat:
          enabled: false
          # 慢SQL记录
          log-slow-sql: false
          slow-sql-millis: 1000
          log-slow-sql: true
          slow-sql-millis: 3000
          merge-sql: true
        wall:
          config:
@@ -148,7 +152,7 @@
# Swagger配置
swagger:
  # 是否开启swagger
  enabled: true
  enabled: false
  # 请求前缀
  pathMapping: /dev-api

@@ -215,10 +219,9 @@
#  指定asr回调的url路径(本地)
ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
#挂断IP(本地)
hangup: http://192.168.100.6:8089/hangup
hangup: http://192.168.100.10:8089/hangup
#fs所使用的阿里的app_key(本地)
app_key_yq: ZurNHpaQLq6P55YS

##  指定asr回调的url路径(新华)
#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
##挂断IP(新华)
@@ -255,7 +258,7 @@
#第个小时电话拨打的上限
phoneUpEveryHour: 12
#电话每天结束时间
phoneEndHour: 20
phoneEndHour: 23

#新员工默认密码
defaultPwd: 123456
@@ -267,10 +270,12 @@
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13


isEncryp:
isEncryp: 0

dealDeptCode:

#文件上传地址
fileUpload:
profile:

ai_answer: http://localhost:8088/ai_answer

 ruoyi-admin/src/main/resources/application-sltd.yml

@@ -244,3 +244,6 @@
#文件上传地址
fileUpload: http://192.88.117.236:8090
profile: /prod-api/profile

# 来未来app_key
lwl_app_key: ak-zUMiOWhqXiJQWPB1pCbz0pjr

 ruoyi-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@
    # 国际化资源文件路径
    basename: i18n/messages
  profiles:
    active: ls
    active: druid

  # 文件上传
  servlet:
@@ -115,6 +115,8 @@
  mapperLocations: classpath*:mapper/**/*Mapper.xml
  # 加载全局的配置文件
  configLocation: classpath:mybatis/mybatis-config.xml
  # 注册自定义TypeHandler包
  typeHandlersPackage: com.smartor.typehandler
  #configuration:
  #  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

@@ -160,3 +162,13 @@

#用户默认密码
userPwd: 123456

#这些空值都是来未来的变量，先占位
lwl_app_key:
sms_accountName:
sms_password:
sms_url:
sms_sourceAddr:
sms_serviceCode:
sms_appkey:
sms_flag:

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -923,7 +923,12 @@
                    Boolean wxCodeSuccess = false;
                    if (active.equals("hzszlyy")) {
                        if (!map.isEmpty() && map.get("success") != null) {
                            wxCodeSuccess = (boolean) map.get("success");
                            Integer wxCodeSuccessShiyi = (Integer) map.get("success");
                            if(ObjectUtils.isNotEmpty(wxCodeSuccessShiyi) && wxCodeSuccessShiyi == 1){
                                wxCodeSuccess = true;
                            }else {
                                wxCodeSuccess = false;
                            }
                        }
                    } else {
                        if (!map.isEmpty() && map.get("succ") != null) {

 smartor/src/main/java/com/smartor/mapper/SvyTaskTemplateMapper.java

@@ -19,7 +19,7 @@
     * @param svyid 任务问卷模板主键
     * @return 任务问卷模板
     */
    public SvyTaskTemplate selectSvyTaskTemplateBySvyid(Long svyid);
    public SvyTaskTemplate selectSvyTaskTemplateBySvyid(Long id);

    /**
     * 查询任务问卷模板列表

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -14,9 +14,7 @@
import com.smartor.domain.VO.ServiceSubtaskDetailTraceVO;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IServiceSubtaskAnswerService;
import com.smartor.service.IServiceSubtaskDetailTraceService;
import com.smartor.service.IServiceTaskService;
import com.smartor.service.*;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -75,6 +73,18 @@

    @Autowired
    private IServiceSubtaskDetailTraceService traceService;

    @Autowired
    private ISvyTaskTemplateService svyTaskTemplateService;

    @Autowired
    private ISvyLibTemplateScriptService svyLibTemplateScriptService;

    @Autowired
    private IIvrTaskTemplateService ivrTaskTemplateService;

    @Autowired
    private IIvrLibaTemplateScriptService ivrLibaTemplateScriptService;

    @Value("${pri_key}")
    private String pri_key;
@@ -377,9 +387,7 @@
                }
            } else if (serviceSubTaskCacheReq.getType() == 1) {
                List<IvrTaskTemplateScriptVO> cacheList = serviceSubTaskCacheReq.getIvrTaskTemplateScriptVOList();
                cacheList.sort(Comparator.comparingLong(
                        vo -> Optional.ofNullable(vo.getSort()).orElse(0)
                ));
                cacheList.sort(Comparator.comparingLong(vo -> Optional.ofNullable(vo.getSort()).orElse(0)));
                log.error("电话随访问卷回答结果：{}", cacheList.size());
                for (int i = 0; i < cacheList.size(); i++) {
                    if (i == 0) {
@@ -819,6 +827,9 @@

            }
            nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
            if (StringUtils.isEmpty(nextScriptNo)) {
                nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
            }
            if (svyTaskTemplateScriptVO.getScore() != null) {
                score = String.valueOf(svyTaskTemplateScriptVO.getScore());
            }
@@ -833,7 +844,10 @@
                    score = String.valueOf(svyTaskTemplateScriptVO.getScore());
                }
            }
            nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString();
            nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno();
            if (StringUtils.isEmpty(nextScriptNo)) {
                nextScriptNo = getNextScriptNo(svyTaskTemplateScriptVO.getTemplateID(), svyTaskTemplateScriptVO.getScriptContent());
            }
        }
        ServiceTask serviceTask = serviceTaskService.selectServiceTaskByTaskid(taskid);
        serviceSubtaskDetailVO.setQuestiontext(svyTaskTemplateScriptVO.getScriptContent());
@@ -848,9 +862,7 @@
        serviceSubtaskDetailVO.setCreateTime(new Date());
        serviceSubtaskDetailVO.setUpdateTime(new Date());
        serviceSubtaskDetailVO.setTemplateType(2);
        serviceSubtaskDetailVO.setLibTemplateid(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ?
                (ObjectUtils.isNotEmpty(selectServiceSubtaskList.get(0).getLibtemplateid()) ?
                        selectServiceSubtaskList.get(0).getLibtemplateid().intValue() : null): null);
        serviceSubtaskDetailVO.setLibTemplateid(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? (ObjectUtils.isNotEmpty(selectServiceSubtaskList.get(0).getLibtemplateid()) ? selectServiceSubtaskList.get(0).getLibtemplateid().intValue() : null) : null);
        if (ObjectUtils.isNotEmpty(serviceTask)) {
            serviceSubtaskDetailVO.setGuid(serviceTask.getGuid());
            serviceSubtaskDetailVO.setOrgid(serviceTask.getOrgid());
@@ -954,6 +966,33 @@
        map.put("isabnormal", isabnormalFlag.toString());
        return map;
    }

    private String getNextScriptNo(Long taskTemplateID, String scriptContent) {
        SvyTaskTemplate svyTaskTemplate = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(taskTemplateID);
        SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
        svyLibTemplateScript.setSvyid(svyTaskTemplate.getTemplateid());
        svyLibTemplateScript.setScriptContent(scriptContent);
        List<SvyLibTemplateScript> svyLibTemplateScriptList = svyLibTemplateScriptService.selectSvyLibTemplateScriptList(svyLibTemplateScript);
        if (CollectionUtils.isNotEmpty(svyLibTemplateScriptList)) {
            return svyLibTemplateScriptList.get(0).getNextScriptno();
        }
        return null;
    }

    private Long getVoiceNextScriptNo(Long taskTemplateID, String scriptContent) {
        IvrTaskTemplate ivrTaskTemplate = ivrTaskTemplateService.selectIvrTaskTemplateByID(taskTemplateID);
        IvrLibaTemplateScript ivrLibaTemplateScript = new IvrLibaTemplateScript();
        if (StringUtils.isEmpty(ivrTaskTemplate.getLibtemplateid())) return null;
        ivrLibaTemplateScript.setTemplateid(Long.valueOf(ivrTaskTemplate.getLibtemplateid()));
        ivrLibaTemplateScript.setScriptContent(scriptContent);
        List<IvrLibaTemplateScript> ivrLibaTemplateScriptList = ivrLibaTemplateScriptService.selectIvrLibaTemplateScriptList(ivrLibaTemplateScript);

        if (CollectionUtils.isNotEmpty(ivrLibaTemplateScriptList)) {
            return ivrLibaTemplateScriptList.get(0).getNextScriptno();
        }
        return null;
    }


    private Boolean sendTaskIds(List<Integer> sendTaskids, ServiceSubtask serviceSubtask) {
        for (Integer taskId : sendTaskids) {
@@ -1061,6 +1100,10 @@

            }
            nextScriptNo = ivrTaskTemplateScriptVO.getNextScriptno() == null ? null : ivrTaskTemplateScriptVO.getNextScriptno().toString();
            if (StringUtils.isEmpty(nextScriptNo)) {
                nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent());
            }

            if (ivrTaskTemplateScriptVO.getScore() != null) {
                score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
            }
@@ -1079,6 +1122,9 @@
                serviceSubtaskDetailVO.setMatchedtext(ivrTaskTemplateScriptVO.getQuestionResult() != null ? ivrTaskTemplateScriptVO.getQuestionResult().replaceAll("^\"|\"$", "") : ivrTaskTemplateScriptVO.getIvrtext());
                serviceSubtaskDetailVO.setScore(ivrTaskTemplateScriptVO.getScore() != null ? ivrTaskTemplateScriptVO.getScore().toString() : "0");
                nextScriptNo = ivrTaskTemplateScriptVO.getNextScriptno() == null ? null : ivrTaskTemplateScriptVO.getNextScriptno().toString();
                if (StringUtils.isEmpty(nextScriptNo)) {
                    nextScriptNo = "" + getVoiceNextScriptNo(ivrTaskTemplateScriptVO.getTemplateID(), ivrTaskTemplateScriptVO.getScriptContent());
                }
                if (ivrTaskTemplateScriptVO.getScore() != null) {
                    score = String.valueOf(ivrTaskTemplateScriptVO.getScore());
                }