From 288ded5874ea9327d0b8fdfd6a7960425600727f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Jul 2023 14:26:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java | 6 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java | 18 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.xml | 170 ++++++++++++++++++++++++++++++---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java | 6 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java | 3
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java | 42 ++++++++
6 files changed, 225 insertions(+), 20 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
index 4b51f8c..02e61d8 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/Rules.java
@@ -114,4 +114,22 @@
@ApiModelProperty("是否有闸（1有闸、2无闸）")
private String isGate;
+ /**
+ * 是否消息通知（0：不通知，1：通知）
+ */
+ @ApiModelProperty("是否消息通知（0：不通知，1：通知）")
+ private String isMessage;
+
+ /**
+ * 消息通知类型（0：站内信，1：短信）
+ */
+ @ApiModelProperty("消息通知类型（0：站内信，1：短信）")
+ private String messageType;
+
+ /**
+ * 短信模板id
+ */
+ @ApiModelProperty("短信模板id")
+ private String templateId;
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java
new file mode 100644
index 0000000..f7f5520
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/push/utils/PushUtil.java
@@ -0,0 +1,42 @@
+package cn.gistack.alerts.push.utils;
+
+import cn.gistack.alerts.push.vo.PushVO;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class PushUtil {
+
+ private String UNI_CLOUD_PUSH_URL = "https://fc-mp-ad1ed7e3-700e-4fca-abae-0d097cc222b5.next.bspapp.com/push";
+
+// public static void main(String[] args) throws IOException {
+//
+//
+// }
+
+ /**
+ * 消息推送
+ * @param pushVO
+ */
+ public void pushMessage(PushVO pushVO){
+ RestTemplate template = new RestTemplate();
+ Map<String, Object> params = new LinkedHashMap<>();
+
+ params.put("push_clientid",pushVO.getCIds());
+ params.put("title",pushVO.getTitle());
+ params.put("content",pushVO.getContent());
+
+ String result = template.postForObject(UNI_CLOUD_PUSH_URL, params, String.class);
+ }
+
+ /**
+ * 根据电话获取cIds
+ * @param phoneIds
+ */
+ public void getCIdsByPhone(List<String> phoneIds){
+
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
index 191d93e..48b8739 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
@@ -41,6 +41,12 @@
return R.data(pageList);
}
+ @ApiOperation(value="短信发送模板-分页列表查询", notes="短信发送模板-分页列表查询")
+ @GetMapping(value = "/listAll")
+ public R listAll(SmsTemplate smsTemplate) {
+ return R.data(smsTemplateService.list(Condition.getQueryWrapper(smsTemplate)));
+ }
+
/**
* 自定义列表查询
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
index e2f01d6..d8358a8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallTaskMapper.java
@@ -187,5 +187,6 @@
@DS("ztznwh")
@InterceptorIgnore(tenantLine = "true")
List<CallTaskResultVO> getCallResultListTemp(@Param("page") IPage<CallTaskResultVO> page,
- @Param("callTaskResult") CallTaskResultVO callTaskResult);
+ @Param("callTaskResult") CallTaskResultVO callTaskResult,
+ @Param("list") List<String> list);
}
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 9f338c7..873446a 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
@@ -679,6 +679,121 @@
</if>
</select>
+<!-- <!–详情导出临时接口–>-->
+<!-- <select id="getCallResultListTemp" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskResultVO">-->
+<!-- select-->
+<!-- ctr."id",-->
+<!-- ctr."call_result" as callResult,-->
+<!-- ctr."call_duration" as callDuration,-->
+<!-- ctr."call_conversation_round" as callConversationRound,-->
+<!-- ctr."call_hangup_direction" as callHangupDirection,-->
+<!-- ctr."call_id" as callId,-->
+<!-- date_format(ctr."gmt_create",'%Y-%m-%d %H:%i:%s') as gmtCreate,-->
+<!-- ctr."calling_number" as callingNumber,-->
+<!-- ctr."callee_number" as calleeNumber,-->
+<!-- ctr."task_id" as taskId,-->
+<!-- ctr."call_start_time" as callStartTime,-->
+<!-- date_format(ctr."call_end_time",'%Y-%m-%d %H:%i:%s') as callEndTime,-->
+<!-- ctr."call_record_file" as callRecordFile,-->
+<!-- ctr."intention_customer_flag" as intentionCustomerFlag,-->
+<!-- ctr."is_deleted" as isDeleted,-->
+<!-- ctc.waterCode,-->
+<!-- aab."ad_name" as areaName,-->
+<!-- case when ctr."call_result"!='200000' then concat(-->
+<!-- if(ifnull(scnfr.is_danger,0)='0','',if(scnfr.is_danger='是','发现险情,','未发现险情,')),-->
+<!-- if(ifnull(scnfr.is_patrol_person,0)='0','',if(scnfr.is_patrol_person='是','是巡查责任人,','不是巡查责任人,')) ,-->
+<!-- if(ifnull(scnfr.is_patrol,0)='0','',if(scnfr.is_patrol='是','已巡查,','未巡查,')),-->
+<!-- if(ifnull(scnfr.is_over,0)='0','',if(scnfr.is_over='是','超汛限','未超汛限'))-->
+<!-- )-->
+<!-- else cas."tag_title" end as tagTitle,-->
+<!-- ctc.userName,-->
+<!-- arb."name" as waterName,-->
+<!-- arb."res_reg_code" resRegCode,-->
+<!-- arb."eng_scal" engScal,-->
+<!-- arb."res_type" resType,-->
+<!-- arb."rv_name" rvName,-->
+<!-- REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,2) as cityName,-->
+<!-- REGEXP_SUBSTR (arb."res_loc",'[^-]+',1,3) as countyName,-->
+<!-- if(ifnull(scnfr.call_id,0)='0','','已反馈') isSmsFill,-->
+<!-- case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_danger,0)>'0',if(scnfr.is_danger='是',2,1),0)-->
+<!-- else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'未发现险情')>0,1,if(instr(cas."tag_title",'发现险情')>0,2,0)),0) end as isDange,-->
+<!-- case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_patrol_person,0)>'0',if(scnfr.is_patrol_person='是',2,1),0)-->
+<!-- else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查责任人-未识别')>0,0,if(instr(cas."tag_title",'不是巡查责任人')>0,1,if(instr(cas."tag_title",'是巡查责任人')>0,2,0))),0) end as isMan,-->
+<!-- case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_patrol,0)>'0',if(scnfr.is_patrol='是',2,1),0)-->
+<!-- else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否巡查-未识别')>0,0,if(instr(cas."tag_title",'未巡查')>0,1,if(instr(cas."tag_title",'已巡查')>0,2,0))),0) end as isPatrol,-->
+<!-- case when ctr."call_result"!='200000' then if(ifnull(scnfr.is_over,0)>'0',if(scnfr.is_over='是',2,1),0)-->
+<!-- else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否超汛限-未识别')>0,0,if(instr(cas."tag_title",'未超汛限')>0,1,if(instr(cas."tag_title",'超汛限')>0,2,0))),0) end as isOver-->
+<!-- from-->
+<!-- (-->
+<!-- select ctr.* from SJZT_ODS."call_task_result" ctr-->
+<!-- left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"-->
+<!-- left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"-->
+<!-- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate}-->
+<!-- and (sdct.type = '1' or sdct.type = '2' or sdct.type = '3') and ctr."call_result" = '200000' and ct."scene_id" = 228-->
+<!-- union-->
+<!-- select ctr.* from SJZT_ODS."call_task_result" ctr-->
+<!-- left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"-->
+<!-- left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"-->
+<!-- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate}-->
+<!-- and sdct.type = '3' and ctr."call_result" != '200000' and ct."scene_id" = 228-->
+<!-- union all-->
+<!-- select ctr.* from SJZT_ODS."call_task_result" ctr-->
+<!-- left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"-->
+<!-- left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"-->
+<!-- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate} and ct."scene_id" = 228-->
+<!-- and sdct.task_id is null-->
+<!-- ) ctr-->
+<!-- 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."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-->
+<!-- (-->
+<!-- SELECT ctra."call_id", replace(WM_CONCAT(ctag."tag_title"),',', ',') as "tag_title" from "SJZT_ODS"."call_tag" ctag-->
+<!-- left join "SJZT_ODS"."call_task_result_attribute" ctra on ctag."id" = ctra."attribute_value"-->
+<!-- GROUP BY ctra."call_id"-->
+<!-- ) cas-->
+<!-- on cas."call_id" = ctr."call_id"-->
+<!-- left join "SJZT_ODS"."call_task" ct on ct."id" = ctr."task_id"-->
+<!-- left join "YWXT".sm_call_not_fill_record scnfr on scnfr.call_id = ctr."call_id"-->
+<!-- where 1=1-->
+<!-- <if test="callTaskResult.taskId!=null and callTaskResult.taskId!=''">-->
+<!-- and ctr."task_id" = #{callTaskResult.taskId}-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.waterName!=null and callTaskResult.waterName!=''">-->
+<!-- and arb."name" like concat('%',#{callTaskResult.waterName},'%')-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.isSmsFill!=null and callTaskResult.isSmsFill=='已反馈'">-->
+<!-- and scnfr.call_id is not null-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.isSmsFill!=null and callTaskResult.isSmsFill=='未反馈'">-->
+<!-- and scnfr.call_id is null and ctr."call_result"!='200000'-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.userName!=null and callTaskResult.userName!=''">-->
+<!-- and ctc.userName like concat('%',#{callTaskResult.userName},'%')-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.taskName!=null and callTaskResult.taskName!=''">-->
+<!-- and ct."task_name" like concat(concat('%',#{callTaskResult.taskName}),'%')-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.taskStatus!=null">-->
+<!-- and ct."task_status" = #{callTaskResult.taskStatus}-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">-->
+<!-- and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}-->
+<!-- </if>-->
+<!-- <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">-->
+<!-- and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskResult.endTime}-->
+<!-- </if>-->
+<!-- order by ctr."gmt_create" desc-->
+<!-- </select>-->
+
<!--详情导出临时接口-->
<select id="getCallResultListTemp" resultType="cn.gistack.sm.intelligentCall.vo.CallTaskResultVO">
select
@@ -725,22 +840,47 @@
else if(ifnull(cas."tag_title",0)>'0',if(instr(cas."tag_title",'是否超汛限-未识别')>0,0,if(instr(cas."tag_title",'未超汛限')>0,1,if(instr(cas."tag_title",'超汛限')>0,2,0))),0) end as isOver
from
(
- select ctr.* from SJZT_ODS."call_task_result" ctr
- left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
- left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate}
- and (sdct.type = '1' or sdct.type = '2' or sdct.type = '3') and ctr."call_result" = '200000' and ct."scene_id" = 228
- union
- select ctr.* from SJZT_ODS."call_task_result" ctr
- left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
- left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate}
- and sdct.type = '3' and ctr."call_result" != '200000' and ct."scene_id" = 228
+ select ctr.* from SJZT_ODS."call_task_result" ctr right join
+ (
+ select max("gmt_create") "gmt_create",waterCode,"callee_number" from (
+ select ctr.*,ctc.waterCode from SJZT_ODS."call_task_result" ctr right join (
+ select date_format(create_time,'%Y-%m-%d') time,wm_concat(task_id) task_id from YWXT.sm_daily_call_task group by date_format(create_time,'%Y-%m-%d')
+ ) sdct on locate(ctr."task_id",sdct.task_id) >0 left join (
+ select "call_id",JSON_VALUE("call_task_callee_content",'$."$水库编码$"') as waterCode from "SJZT_ODS"."call_task_callee"
+ ) ctc on ctr."call_id" = ctc."call_id"
+ where 1=1
+ <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
+ and sdct.time >= #{callTaskResult.startTime}
+ </if>
+ <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
+ and sdct.time <= #{callTaskResult.endTime}
+ </if>
+ <if test="list != null and list.size()>0">
+ and ctr."task_id" in
+ <foreach collection="list" item="taskId" separator ="," open="(" close=")">
+ #{taskId}
+ </foreach>
+ </if>
+ ) a group by date_format("gmt_create",'%Y-%m-%d'),waterCode,"callee_number"
+ ) b on ctr."gmt_create" = b."gmt_create" and ctr."callee_number" = b."callee_number"
union all
select ctr.* from SJZT_ODS."call_task_result" ctr
left join SJZT_ODS."call_task" ct on ct."id" = ctr."task_id"
left join YWXT.sm_daily_call_task sdct on sdct.task_id = ct."id"
- where date_format(ctr."gmt_create",'%Y-%m-%d') = #{callTaskResult.gmtCreate} and ct."scene_id" = 228
+ where 1=1
+ <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
+ and ct."scene_id" = 228
+ and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
+ </if>
+ <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
+ and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskResult.endTime}
+ </if>
+ <if test="list != null and list.size()>0">
+ and ctr."task_id" in
+ <foreach collection="list" item="taskId" separator ="," open="(" close=")">
+ #{taskId}
+ </foreach>
+ </if>
and sdct.task_id is null
) ctr
left join
@@ -784,12 +924,6 @@
</if>
<if test="callTaskResult.taskStatus!=null">
and ct."task_status" = #{callTaskResult.taskStatus}
- </if>
- <if test="callTaskResult.startTime!=null and callTaskResult.startTime!=''">
- and date_format(ctr."gmt_create",'%Y-%m-%d') >= #{callTaskResult.startTime}
- </if>
- <if test="callTaskResult.endTime!=null and callTaskResult.endTime!=''">
- and date_format(ctr."gmt_create",'%Y-%m-%d') <= #{callTaskResult.endTime}
</if>
order by ctr."gmt_create" desc
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
index 89f53c6..a97086b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -990,7 +990,11 @@
*/
@Override
public Object getCallResultListTemp(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
+ List<String> list = new ArrayList<>();
+ if (null!=callTaskResult.getIds() && !callTaskResult.getIds().equals("")){
+ list = Arrays.asList(callTaskResult.getIds().split(","));
+ }
// 不分页
- return callTaskMapper.getCallResultListTemp(null,callTaskResult);
+ return callTaskMapper.getCallResultListTemp(null,callTaskResult,list);
}
}
--
Gitblit v1.9.3