From 80e7b61a170cf326cddf4bbc025ab5e2a69aebf4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 05 Jun 2023 10:09:58 +0800
Subject: [PATCH] 告警通知feign 返回修改，智能外呼人员查询修改只查接通的
---
skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java | 36 ++++++++++++++++++------------------
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml | 3 ++-
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java | 2 +-
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java | 2 +-
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java | 2 +-
5 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java
index 11fe8f5..bc1d4d9 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClient.java
+++ b/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);
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java
index 23e54a0..70d6c7b 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/notice/feign/NoticeClientFallBack.java
+++ b/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;
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java
index c00c5c5..ed6db28 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/feign/NoticeFeignClient.java
+++ b/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);
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
index a7d969f..73ada6c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml
+++ b/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') <= #{params.endTime}
+ and "call_result" = '200000'
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java b/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java
index 21cd18a..c802a92 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java
+++ b/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("结束自动创建任务...");
// 返回
--
Gitblit v1.9.3