zhongrj
2023-05-03 f6f8070ad5b5d370f202d74688c42fe2f7b38682
智能外呼创建,查询导出修改
4 files modified
27 ■■■■■ changed files
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java 18 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -40,7 +40,7 @@
    /**
     * nacos dev 地址
     */
    String NACOS_DEV_ADDR = "127.0.0.1:8848";
    String NACOS_DEV_ADDR = "127.0.0.1:8849";
    /**
     * nacos prod 地址
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java
@@ -23,7 +23,7 @@
    public static final String AppSecret = "ea3b23ecdb2247e9bcbccbdee7d5dbf4";
    public static final String scenesId = "230";
    public static final String scenesId = "228";
    public static final String callingNumbers = "00862787222298";
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
@@ -20,7 +20,7 @@
        left join (select * from "SJZT_ODS"."call_scenes" where "is_deleted" = 0) cs on ct."scene_id" = cs."id"
        left join (select DISTINCT "task_id","calling_number" from "SJZT_ODS"."call_task_result") ctr on ctr."task_id" = ct."id"
        left join "SJZT_ODS"."call_task_result_analyse" ctra on  ctra."task_id" = ct."id"
        where 1=1
        where 1=1 and ct."is_deleted" = 0
        <if test="callTask.taskName!=null and callTask.taskName!=''">
            and ct."task_name" like concat(concat('%',#{callTask.taskName}),'%')
        </if>
@@ -73,11 +73,12 @@
        left join
        (
        select "callee_number",
        "call_id",
        "task_id",
        JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode,
        JSON_VALUE("call_task_callee_content",'$."$用户名$"') as userName from "SJZT_ODS"."call_task_callee"
        ) ctc
        on ctr."task_id" = ctc."task_id" and ctr."callee_number" = ctc."callee_number"
        on ctr."call_id" = ctc."call_id"
        left join "SJZT_MD"."att_res_base" arb on ctc.waterCode = arb."code"
        left join "SJZT_MD"."att_ad_base" aab on aab."guid" = concat(arb."ad_guid",'000000')
        left join
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -73,11 +73,19 @@
        LocalDateTime now = LocalDateTime.now();
        String timestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss SSS"));
        String transId = generateTransId(now);
//        String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";
        String taskName = map.get("taskName").toString();
        String taskName = now.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm")) + "智能外呼";;
        if(null!= map.get("taskName") && !map.get("taskName").equals("")){
            taskName = map.get("taskName").toString();
        }
        String[] numbers = StringUtils.split(callingNumbers,",");
//        String taskScheduleTime = LocalDateTime.now().plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        String taskScheduleTime = map.get("taskScheduleTime").toString();
        String taskScheduleTime = LocalDateTime.now().plusHours(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
        if (null!=map.get("taskScheduleTime") && !map.get("taskScheduleTime").equals("")){
            taskScheduleTime = map.get("taskScheduleTime").toString();
        }
        String scenesIds = scenesId;
        if (null!=map.get("scenesId") && !map.get("scenesId").equals("")){
            scenesIds = map.get("scenesId").toString();
        }
        JSONArray arr = getCalleeInfo(params);
        HttpHeaders httpHeaders = new HttpHeaders();
        httpHeaders.add("Content-Type", CONTENT_TYPE);
@@ -85,7 +93,7 @@
        httpHeaders.add("Accept-Encoding", ACCEPT_ENCODING);
        JSONObject paramJson = new JSONObject();
        paramJson.put("taskName", taskName);
        paramJson.put("scenesId", scenesId);
        paramJson.put("scenesId", scenesIds);
        paramJson.put("callingNumbers", numbers);
        paramJson.put("taskScheduleTime", taskScheduleTime);
        paramJson.put("calleeData", arr);