Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-06-05 70f08b8141b9ef7acb987ffdd59c94583f26a1c5

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java

@@ -25,7 +25,7 @@
     * @return
     */
    @GetMapping(CREATE_ALARM_NOTICE_TASK_JOB_HANDLER)
    Object createAlarmNoticeTaskJobHandler(@RequestParam("name") String name,
    String createAlarmNoticeTaskJobHandler(@RequestParam("name") String name,
                                           @RequestParam("content") String content,
                                           @RequestParam("title") String type);


 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java

@@ -11,7 +11,7 @@
public class NoticeClientFallBack implements NoticeClient {

    @Override
    public Object createAlarmNoticeTaskJobHandler(String name, String content, String type) {
    public String createAlarmNoticeTaskJobHandler(String name, String content, String type) {
        return null;
    }
}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClient.java

@@ -29,7 +29,7 @@
     * @return
     */
    @GetMapping(CREATE_OUT_CALL_TASK_JOB_HANDLER)
    Object createOutCallTaskJobHandler(@RequestParam("isOver") String isOver,
    String createOutCallTaskJobHandler(@RequestParam("isOver") String isOver,
                                               @RequestParam("taskScheduleTime") String taskScheduleTime,
                                               @RequestParam("personNumber") String personNumber,
                                               @RequestParam("day") String day);
@@ -43,7 +43,7 @@
     * @return
     */
    @GetMapping(TEST_OUT_CALL)
    Object testOutCall(@RequestParam("isOver") String isOver,
    String testOutCall(@RequestParam("isOver") String isOver,
                       @RequestParam("taskScheduleTime") String taskScheduleTime,
                       @RequestParam("personNumber") String personNumber,
                       @RequestParam("day") String day);

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallClientFallback.java

@@ -10,12 +10,12 @@
@Component
public class OutCallClientFallback implements OutCallClient {
    @Override
    public Object createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
        return null;
    }

    @Override
    public Object testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
        return null;
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java

@@ -29,7 +29,7 @@
     */
    @GetMapping(CREATE_ALARM_NOTICE_TASK_JOB_HANDLER)
    @Override
    public Object createAlarmNoticeTaskJobHandler(String name, String content, String type) {
    public String createAlarmNoticeTaskJobHandler(String name, String content, String type) {
        return applicationContext.doSomethingByStrategy(name, content, type);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/feign/OutCallImplImplClient.java

@@ -25,7 +25,7 @@

    @Override
    @GetMapping(CREATE_OUT_CALL_TASK_JOB_HANDLER)
    public Object createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String createOutCallTaskJobHandler(String isOver, String taskScheduleTime, String personNumber, String day) {
        Map<String, Object> map = new HashMap<>();
        map.put("isOver",isOver);
        map.put("taskScheduleTime",taskScheduleTime);
@@ -44,7 +44,7 @@
     * @return
     */
    @Override
    public Object testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
    public String testOutCall(String isOver, String taskScheduleTime, String personNumber, String day) {
        Map<String, Object> map = new HashMap<>();
        map.put("isOver",isOver);
        map.put("taskScheduleTime",taskScheduleTime);

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml

@@ -285,10 +285,11 @@
        ) b
    </select>

    <!--查询外呼多少天内已呼叫过的人员手机号集合信息-->
    <!--查询外呼多少天内已呼叫过的人员手机号集合信息-并只取接通的号码-->
    <select id="getCallUserPhoneByParam" resultType="java.lang.String">
        select "callee_number" from SJZT_ODS."call_task_result"
        where date_format("gmt_create",'%Y-%m-%d') >= #{params.startTime}
        and date_format("gmt_create",'%Y-%m-%d') &lt;= #{params.endTime}
        and "call_result" = '200000'
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/CallService.java

@@ -15,7 +15,7 @@
     * @param map
     * @return
     */
    Object createTask(Map<String,Object> map);
    String createTask(Map<String,Object> map);

    /**
     * 获取通话详情
@@ -67,5 +67,5 @@
     * @param params
     * @return
     */
    Object createCallTaskByParam(Map<String, Object> params);
    String createCallTaskByParam(Map<String, Object> params);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java

@@ -69,7 +69,7 @@
     * @return
     */
    @Override
    public Object createTask(Map<String,Object> map) {
    public String createTask(Map<String,Object> map) {
        List<Map<String, String>> params = (List<Map<String, String>>) map.get("list");
        String requestUrl = url + CREATE_TASK_URL;
        LocalDateTime now = LocalDateTime.now();
@@ -320,7 +320,7 @@
     * @return
     */
    @Override
    public Object createCallTaskByParam(Map<String, Object> params) {
    public String createCallTaskByParam(Map<String, Object> params) {
        // 自动创建任务的 4个条件  1：呼叫人数  2：调度时间  3：是否超汛限  4：多少天内呼叫过的不呼叫（天数）
        //1. 调用中台接口查询出所有需要发任务的水库巡查责任人相关信息（该处需要将是否超汛限条件传入）
        JSONArray jsonArray = getZtWaterMangerData(params);

 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java

@@ -28,7 +28,7 @@
    public ReturnT<String> waterInfoNotHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位信息接收不到","","waterInfoNotHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位信息接收不到","","waterInfoNotHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -45,7 +45,7 @@
    public ReturnT<String> waterDataExcHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位数据异常","","waterDataExcHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位数据异常","","waterDataExcHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -62,7 +62,7 @@
    public ReturnT<String> waterLessDeadHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位超低于死水位","","waterLessDeadHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超低于死水位","","waterLessDeadHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -79,7 +79,7 @@
    public ReturnT<String> waterMoreDeadLessHJHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位高于死水位，低于旱警水位","","waterMoreDeadLessHJHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位高于死水位，低于旱警水位","","waterMoreDeadLessHJHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -96,7 +96,7 @@
    public ReturnT<String> waterComeOverHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近汛限告警","","waterComeOverHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近汛限告警","","waterComeOverHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -113,7 +113,7 @@
    public ReturnT<String> waterFirstOverHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位初次超汛限告警","","waterFirstOverHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位初次超汛限告警","","waterFirstOverHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -130,7 +130,7 @@
    public ReturnT<String> waterSmallScaleOverHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位小幅超汛限告警","","waterSmallScaleOverHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位小幅超汛限告警","","waterSmallScaleOverHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -147,7 +147,7 @@
    public ReturnT<String> waterBigScaleOverHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位大幅超汛限告警","","waterBigScaleOverHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位大幅超汛限告警","","waterBigScaleOverHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -164,7 +164,7 @@
    public ReturnT<String> waterComeDesignHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近设计洪水位告警","","waterComeDesignHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位接近设计洪水位告警","","waterComeDesignHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -181,7 +181,7 @@
    public ReturnT<String> waterMoreDesignHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位超设计洪水位告警","","waterMoreDesignHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超设计洪水位告警","","waterMoreDesignHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -198,7 +198,7 @@
    public ReturnT<String> waterMoreCheckHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("水位超校核洪水位告警","","waterMoreCheckHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("水位超校核洪水位告警","","waterMoreCheckHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -215,7 +215,7 @@
    public ReturnT<String> waterComeOneHourUpHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡升","","waterComeOneHourUpHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡升","","waterComeOneHourUpHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -232,7 +232,7 @@
    public ReturnT<String> waterComeOneHourDownHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡降","","waterComeOneHourDownHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("近1h水位陡降","","waterComeOneHourDownHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -249,7 +249,7 @@
    public ReturnT<String> rainstormHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("暴雨降雨预警","","rainstormHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("暴雨降雨预警","","rainstormHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -266,7 +266,7 @@
    public ReturnT<String> alreadyHeavyRainHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("已降大雨告警","","alreadyHeavyRainHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("已降大雨告警","","alreadyHeavyRainHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -283,7 +283,7 @@
    public ReturnT<String> alreadyRainstormHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("已降暴雨告警","","alreadyRainstormHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("已降暴雨告警","","alreadyRainstormHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -300,7 +300,7 @@
    public ReturnT<String> twoHourRainHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("2小时降雨告警","","twoHourRainHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("2小时降雨告警","","twoHourRainHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
@@ -317,7 +317,7 @@
    public ReturnT<String> sixHourRainHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        Object result = noticeClient.createAlarmNoticeTaskJobHandler("6小时降雨告警","","sixHourRainHandle");
        String result = noticeClient.createAlarmNoticeTaskJobHandler("6小时降雨告警","","sixHourRainHandle");
        XxlJobLogger.log("任务响应结果：" + result);
        XxlJobLogger.log("结束自动创建任务...");
        // 返回