From ebf10ccf6217dfeebad750b4f4bb9ef4d9af68b0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 02 Jun 2023 16:14:52 +0800
Subject: [PATCH] 新增告警模块，告警相关（告警信息，短信相关）代码从 sm 模块抽离
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java | 52 ++
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleDetailVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java | 8
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRecord.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordDetailService.java | 6
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java | 3
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml | 5
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/pom.xml | 17
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsResultController.java | 8
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml | 8
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java | 21
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java | 265 ++++++++++
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordDetailVO.java | 4
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestHead.java | 0
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleDetailService.java | 6
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRule.java | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/AlertsApplication.java | 24
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClientFallback.java | 20
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java | 226 --------
skjcmanager/skjcmanager-service-api/pom.xml | 1
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleVO.java | 5
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCallDetailParam.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/pom.xml | 74 ++
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java | 50 +
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java | 8
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.java | 9
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java | 125 ++++
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsRecordService.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsResultService.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordDetailController.java | 8
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsTemplateVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java | 6
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsRecordVO.java | 4
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java | 0
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsResult.java | 3
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java | 6
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java | 36 +
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java | 9
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml | 4
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Scene.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java | 76 +-
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdDetailParam.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java | 10
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPlainResult.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/launch/AlertsLauncherServiceImpl.java | 48 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTaskResult.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestParam.java | 0
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPartyResult.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java | 11
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java | 5
skjcmanager/skjcmanager-service/pom.xml | 1
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.java | 7
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecordDetail.java | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-dev.yml | 43 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdBaseParam.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleDetailController.java | 8
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java | 12
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTask.java | 0
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java | 4
skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/SmsConstant.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java | 2
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallBackDetailVO.java | 0
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Head.java | 0
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java | 10
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsTemplateService.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.java | 7
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.xml | 4
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java | 6
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java | 12
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRequest.java | 2
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-prod.yml | 41 +
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCreateTaskParam.java | 0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml | 2
/dev/null | 31 -
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java | 25
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 4
100 files changed, 1,079 insertions(+), 449 deletions(-)
diff --git a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
index f7dbc3e..cfb472c 100644
--- a/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
+++ b/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 地址
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/constant/SmsConstant.java b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/SmsConstant.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/constant/SmsConstant.java
rename to skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/SmsConstant.java
index 93c2c3a..88db629 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/constant/SmsConstant.java
+++ b/skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/SmsConstant.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.sms.constant;
+package cn.gistack.common.constant;
/**
* 短信常量
diff --git a/skjcmanager/skjcmanager-service-api/pom.xml b/skjcmanager/skjcmanager-service-api/pom.xml
index 6163f2c..a32c0c9 100644
--- a/skjcmanager/skjcmanager-service-api/pom.xml
+++ b/skjcmanager/skjcmanager-service-api/pom.xml
@@ -22,6 +22,7 @@
<module>skjcmanager-system-api</module>
<module>skjcmanager-user-api</module>
<module>skjcmanager-sm-api</module>
+ <module>skjcmanager-alerts-api</module>
</modules>
<dependencies>
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/pom.xml b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/pom.xml
new file mode 100644
index 0000000..0b90540
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/pom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>skjcmanager-service</artifactId>
+ <groupId>cn.gistack</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>skjcmanager-alerts-api</artifactId>
+ <name>${project.artifactId}</name>
+ <version>${bladex.project.version}</version>
+ <packaging>jar</packaging>
+
+</project>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
index 6e1e9d8..57b851e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.alarmRule.entity;
+package cn.gistack.alerts.alarmRule.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecordDetail.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecordDetail.java
similarity index 96%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecordDetail.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecordDetail.java
index e578001..e426f54 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRecordDetail.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecordDetail.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.alarmRule.entity;
+package cn.gistack.alerts.alarmRule.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRule.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRule.java
index b04a6d3..eb3dc33 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRule.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRule.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.alarmRule.entity;
+package cn.gistack.alerts.alarmRule.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRuleDetail.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java
similarity index 86%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRuleDetail.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java
index 45c5e0e..d20a60b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/entity/AlarmRuleDetail.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java
@@ -1,13 +1,11 @@
-package cn.gistack.sm.alarmRule.entity;
+package cn.gistack.alerts.alarmRule.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
import java.io.Serializable;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordDetailVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordDetailVO.java
similarity index 65%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordDetailVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordDetailVO.java
index c031bdb..38788d7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordDetailVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordDetailVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.alarmRule.vo;
+package cn.gistack.alerts.alarmRule.vo;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
similarity index 83%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
index fc0e527..abe2054 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRecordVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.alarmRule.vo;
+package cn.gistack.alerts.alarmRule.vo;
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleDetailVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleDetailVO.java
similarity index 68%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleDetailVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleDetailVO.java
index 5c0b2c6..febe6f8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleDetailVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleDetailVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.alarmRule.vo;
+package cn.gistack.alerts.alarmRule.vo;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleVO.java
similarity index 68%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleVO.java
index be08261..ffc629a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/vo/AlarmRuleVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRuleVO.java
@@ -1,7 +1,6 @@
-package cn.gistack.sm.alarmRule.vo;
+package cn.gistack.alerts.alarmRule.vo;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
import lombok.Data;
import java.util.List;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRecord.java
similarity index 97%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRecord.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRecord.java
index 222d559..7528ec0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRecord.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.sms.entity;
+package cn.gistack.alerts.sms.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRequest.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRequest.java
similarity index 88%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRequest.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRequest.java
index 178c27f..0ebc7c8 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsRequest.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsRequest.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.sms.entity;
+package cn.gistack.alerts.sms.entity;
import lombok.Data;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsResult.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsResult.java
similarity index 90%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsResult.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsResult.java
index e682846..842de9a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsResult.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsResult.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.sms.entity;
+package cn.gistack.alerts.sms.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -7,7 +7,6 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
/**
* 短信发送结果
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsTemplate.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
similarity index 96%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsTemplate.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
index 95d44ab..3a4898e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/entity/SmsTemplate.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/entity/SmsTemplate.java
@@ -1,4 +1,4 @@
-package cn.gistack.sm.sms.entity;
+package cn.gistack.alerts.sms.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java
new file mode 100644
index 0000000..c3616e2
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClient.java
@@ -0,0 +1,36 @@
+package cn.gistack.alerts.sms.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 短信发送记录
+ * @author zhongrj
+ */
+@FeignClient(
+ value = "blade-alerts",
+ fallback = ISmsRecordClientFallback.class
+)
+public interface ISmsRecordClient {
+
+ String API_PREFIX = "/client";
+ String SAVE_SMS_RECORD = API_PREFIX + "/saveSmsRecord";
+
+ /**
+ * 保存短信发送记录
+ * @param userNumber
+ * @param messageContent
+ * @param templateId
+ * @param code
+ * @param msg
+ * @param number
+ */
+ @GetMapping(SAVE_SMS_RECORD)
+ void saveSmsRecord(@RequestParam("userNumber")String userNumber,
+ @RequestParam("messageContent")String messageContent,
+ @RequestParam("templateId")String templateId,
+ @RequestParam("code")Integer code,
+ @RequestParam("msg")String msg,
+ @RequestParam("number")Integer number);
+}
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClientFallback.java
new file mode 100644
index 0000000..18973cb
--- /dev/null
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/feign/ISmsRecordClientFallback.java
@@ -0,0 +1,20 @@
+package cn.gistack.alerts.sms.feign;
+
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @ClassName Feign失败配置
+ * @Description TODO
+ * @Author aix
+ * @Date 2023/4/23 19:40
+ * @Version 1.0
+ */
+@Component
+public class ISmsRecordClientFallback implements ISmsRecordClient{
+
+ @Override
+ public void saveSmsRecord(String userNumber, String messageContent, String templateId, Integer code, String msg, Integer number) {
+
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRecordVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsRecordVO.java
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRecordVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsRecordVO.java
index bc88ac9..8366ec0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRecordVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsRecordVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.sms.vo;
+package cn.gistack.alerts.sms.vo;
-import cn.gistack.sm.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.entity.SmsRecord;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsResultVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsResultVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
index e2a9cd1..2d629c2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsResultVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsResultVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.sms.vo;
+package cn.gistack.alerts.sms.vo;
-import cn.gistack.sm.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.entity.SmsResult;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsTemplateVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsTemplateVO.java
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsTemplateVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsTemplateVO.java
index f85b984..780ec54 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsTemplateVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/sms/vo/SmsTemplateVO.java
@@ -1,6 +1,6 @@
-package cn.gistack.sm.sms.vo;
+package cn.gistack.alerts.sms.vo;
-import cn.gistack.sm.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
import lombok.Data;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/CallConstant.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/constant/ZtConstant.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTask.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTask.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTask.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTask.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTaskResult.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTaskResult.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTaskResult.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallTaskResult.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/Head.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Head.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/Head.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Head.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/Scene.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Scene.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/Scene.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/Scene.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdBaseParam.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdBaseParam.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdBaseParam.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdBaseParam.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCallDetailParam.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCallDetailParam.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCallDetailParam.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCallDetailParam.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCreateTaskParam.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCreateTaskParam.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCreateTaskParam.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdCreateTaskParam.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdDetailParam.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdDetailParam.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdDetailParam.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdDetailParam.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPartyResult.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPartyResult.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPartyResult.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPartyResult.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPlainResult.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPlainResult.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPlainResult.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdPlainResult.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestHead.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestHead.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestHead.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestHead.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestParam.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestParam.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestParam.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/ThirdRequestParam.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallBackDetailVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallBackDetailVO.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallBackDetailVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallBackDetailVO.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java
similarity index 100%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java
rename to skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskStatistic.java
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
index 7f2fbde..d937235 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClient.java
@@ -1,10 +1,13 @@
package cn.gistack.sm.sjztmd.feign;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* @ClassName AttResManagePersonClent
@@ -22,6 +25,8 @@
String API_PREFIX = "/client";
String QUERY_LIST_BY_PHONE = API_PREFIX + "/queryListByPhone";
String GET_AD_BASE = API_PREFIX + "/getAdBaseById";
+ String GET_PERSONG_LIST_BY_RES_GUID = API_PREFIX + "/getPersonListByResGuid";
+ String GET_USER_LIST_BY_RES_GUID = API_PREFIX + "/getUserListByResGuid";
@GetMapping(QUERY_LIST_BY_PHONE)
R queryListByPhone(@RequestParam("userPhone") String userPhone);
@@ -29,4 +34,20 @@
@GetMapping(GET_AD_BASE)
R getAdBaseById(@RequestParam("guid") String guid);
+ /**
+ * 根据水库编号及责任人类型查询相关责任人信息
+ * @param res_cd
+ * @param personList
+ * @return
+ */
+ @GetMapping(GET_PERSONG_LIST_BY_RES_GUID)
+ List<PersonVO> getPersonListByResGuid(@RequestParam("res_cd") String res_cd, @RequestParam("personList") String personList);
+
+ /**
+ * 根据水库编号查询除责任人之外的人员信息
+ * @param res_cd
+ * @return
+ */
+ @GetMapping(GET_USER_LIST_BY_RES_GUID)
+ List<PersonVO> getUserListByResGuid(@RequestParam("res_cd") String res_cd);
}
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
index a486216..56b3b78 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sjztmd/feign/IAttResManagePersonClientFallback.java
@@ -1,8 +1,11 @@
package cn.gistack.sm.sjztmd.feign;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* @ClassName Feign失败配置
@@ -24,4 +27,13 @@
return R.fail("获取数据失败");
}
+ @Override
+ public List<PersonVO> getPersonListByResGuid(String res_cd, String personList) {
+ return null;
+ }
+
+ @Override
+ public List<PersonVO> getUserListByResGuid(String res_cd) {
+ return null;
+ }
}
diff --git a/skjcmanager/skjcmanager-service/pom.xml b/skjcmanager/skjcmanager-service/pom.xml
index da308b4..4ac8be3 100644
--- a/skjcmanager/skjcmanager-service/pom.xml
+++ b/skjcmanager/skjcmanager-service/pom.xml
@@ -22,6 +22,7 @@
<module>skjcmanager-system</module>
<module>skjcmanager-user</module>
<module>skjcmanager-sm</module>
+ <module>skjcmanager-alerts</module>
</modules>
<dependencies>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/pom.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/pom.xml
new file mode 100644
index 0000000..f2c39fa
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/pom.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>skjcmanager-service</artifactId>
+ <groupId>cn.gistack</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>skjcmanager-alerts</artifactId>
+ <name>${project.artifactId}</name>
+ <version>${bladex.project.version}</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-boot</artifactId>
+ </dependency>
+ <!--开启多数据源-->
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-auto</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <!--引入 sms 短信 sdk -->
+ <dependency>
+ <groupId>cn.com.flaginfo.sdk.cmc</groupId>
+ <artifactId>send-api-sdk</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.gistack</groupId>
+ <artifactId>skjcmanager-sm-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.gistack</groupId>
+ <artifactId>skjcmanager-alerts-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.gistack</groupId>
+ <artifactId>skjcmanager-user-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <username>${docker.username}</username>
+ <password>${docker.password}</password>
+ <repository>${docker.registry.url}/${docker.namespace}/${project.artifactId}</repository>
+ <tag>${project.version}</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ <buildArgs>
+ <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/AlertsApplication.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/AlertsApplication.java
new file mode 100644
index 0000000..3c6938d
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/AlertsApplication.java
@@ -0,0 +1,24 @@
+package cn.gistack.alerts;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springblade.core.cloud.client.BladeCloudApplication;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
+
+@BladeCloudApplication
+@EnableFeignClients({"cn.gistack"})
+@MapperScan({"org.springblade.**.mapper.**","cn.gistack.alerts.**.mapper.**"})
+public class AlertsApplication {
+ public static void main(String[] args) {
+ BladeApplication.run("blade-alerts", AlertsApplication.class, args);
+ }
+
+ @Bean
+ public RestTemplate restTemplate(RestTemplateBuilder builder){
+ return builder.build();
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
similarity index 93%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
index 5a7084c..b4475c0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.alarmRule.controller;
+package cn.gistack.alerts.alarmRule.controller;
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
-import cn.gistack.sm.alarmRule.service.AlarmRecordService;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
+import cn.gistack.alerts.alarmRule.service.AlarmRecordService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordDetailController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordDetailController.java
similarity index 93%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordDetailController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordDetailController.java
index c58425b..628f2ec 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRecordDetailController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordDetailController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.alarmRule.controller;
+package cn.gistack.alerts.alarmRule.controller;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
-import cn.gistack.sm.alarmRule.service.AlarmRecordDetailService;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
similarity index 93%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
index 914adad..5d9a321 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleController.java
@@ -1,10 +1,10 @@
-package cn.gistack.sm.alarmRule.controller;
+package cn.gistack.alerts.alarmRule.controller;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.service.AlarmRuleDetailService;
-import cn.gistack.sm.alarmRule.service.AlarmRuleService;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleDetailService;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleDetailController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleDetailController.java
similarity index 93%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleDetailController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleDetailController.java
index 2d57d3b..8c983c6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/controller/AlarmRuleDetailController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRuleDetailController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.alarmRule.controller;
+package cn.gistack.alerts.alarmRule.controller;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.service.AlarmRuleDetailService;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleDetailService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.java
similarity index 74%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.java
index 8bff826..3bcbdb2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.java
@@ -1,8 +1,7 @@
-package cn.gistack.sm.alarmRule.mapper;
+package cn.gistack.alerts.alarmRule.mapper;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordDetailVO;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordDetailVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.xml
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.xml
index e945fb9..0c560ff 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordDetailMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordDetailMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.alarmRule.mapper.AlarmRecordDetailMapper">
+<mapper namespace="cn.gistack.alerts.alarmRule.mapper.AlarmRecordDetailMapper">
<!--自定义分页列表查询-->
- <select id="selectAlarmRecordDetailPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordDetailVO">
+ <select id="selectAlarmRecordDetailPage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRecordDetailVO">
select * from sm_alarm_record_detail
where 1=1
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
similarity index 78%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
index a69571a..eaaffe6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.mapper;
+package cn.gistack.alerts.alarmRule.mapper;
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
similarity index 90%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
index 57aac7b..530295a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.alarmRule.mapper.AlarmRecordMapper">
+<mapper namespace="cn.gistack.alerts.alarmRule.mapper.AlarmRecordMapper">
<!--自定义分页列表查询-->
- <select id="selectAlarmRecordPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRecordVO">
+ <select id="selectAlarmRecordPage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRecordVO">
select
sar.*,
sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.java
similarity index 78%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.java
index 8322655..b9ee74f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.mapper;
+package cn.gistack.alerts.alarmRule.mapper;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.xml
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.xml
index f35e974..1355c29 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleDetailMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleDetailMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.alarmRule.mapper.AlarmRuleDetailMapper">
+<mapper namespace="cn.gistack.alerts.alarmRule.mapper.AlarmRuleDetailMapper">
<!--自定义分页列表查询-->
- <select id="selectAlarmRuleDetailPage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO">
+ <select id="selectAlarmRuleDetailPage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO">
select * from sm_alarm_rule_detail
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.java
similarity index 76%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.java
index c385065..8326040 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.java
@@ -1,9 +1,8 @@
-package cn.gistack.sm.alarmRule.mapper;
+package cn.gistack.alerts.alarmRule.mapper;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
similarity index 77%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
index 1493a6a..fc9ef38 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/mapper/AlarmRuleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.alarmRule.mapper.AlarmRuleMapper">
+<mapper namespace="cn.gistack.alerts.alarmRule.mapper.AlarmRuleMapper">
<!--自定义分页列表查询-->
- <select id="selectAlarmRulePage" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleVO">
+ <select id="selectAlarmRulePage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleVO">
select sar.* from YWXT.sm_alarm_rule sar where sar.is_deleted = 0
<if test="alarmRule.type!=null and alarmRule.type!=''">
and sar.type = #{alarmRule.type}
@@ -20,12 +20,12 @@
</select>
<!--通过id查询-->
- <select id="getDetailById" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleVO">
+ <select id="getDetailById" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleVO">
select * from sm_alarm_rule where is_deleted = 0 and id = #{id}
</select>
<!--通过id查询-->
- <select id="getAlarmRuleDetailList" resultType="cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO">
+ <select id="getAlarmRuleDetailList" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO">
select sard.*,sst.content as alarmContent
from sm_alarm_rule_detail sard left join sm_sms_template sst on sard.template_id = sst.template_id
where sard.alarm_rule_id = #{id}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordDetailService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordDetailService.java
similarity index 74%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordDetailService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordDetailService.java
index f642c69..a1852e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordDetailService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordDetailService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.service;
+package cn.gistack.alerts.alarmRule.service;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java
similarity index 73%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java
index c75b7df..56dd556 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRecordService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.service;
+package cn.gistack.alerts.alarmRule.service;
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleDetailService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleDetailService.java
similarity index 75%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleDetailService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleDetailService.java
index 2737c76..cd1dc68 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleDetailService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleDetailService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.service;
+package cn.gistack.alerts.alarmRule.service;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java
similarity index 77%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java
index 98af0f3..f290f70 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/AlarmRuleService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRuleService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.alarmRule.service;
+package cn.gistack.alerts.alarmRule.service;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java
similarity index 71%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java
index 3f4f377..4d92df3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordDetailServiceImpl.java
@@ -1,12 +1,11 @@
-package cn.gistack.sm.alarmRule.service.impl;
+package cn.gistack.alerts.alarmRule.service.impl;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
-import cn.gistack.sm.alarmRule.mapper.AlarmRecordDetailMapper;
-import cn.gistack.sm.alarmRule.service.AlarmRecordDetailService;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.mapper.AlarmRecordDetailMapper;
+import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
similarity index 72%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
index 9f5dbba..b5ab126 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.alarmRule.service.impl;
+package cn.gistack.alerts.alarmRule.service.impl;
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
-import cn.gistack.sm.alarmRule.mapper.AlarmRecordMapper;
-import cn.gistack.sm.alarmRule.service.AlarmRecordService;
-import cn.gistack.sm.alarmRule.vo.AlarmRecordVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecord;
+import cn.gistack.alerts.alarmRule.mapper.AlarmRecordMapper;
+import cn.gistack.alerts.alarmRule.service.AlarmRecordService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java
similarity index 70%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java
index 848a23b..9e69e33 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleDetailServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.alarmRule.service.impl;
+package cn.gistack.alerts.alarmRule.service.impl;
-import cn.gistack.sm.alarmRule.entity.AlarmRuleDetail;
-import cn.gistack.sm.alarmRule.mapper.AlarmRuleDetailMapper;
-import cn.gistack.sm.alarmRule.service.AlarmRuleDetailService;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleDetailVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRuleDetail;
+import cn.gistack.alerts.alarmRule.mapper.AlarmRuleDetailMapper;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleDetailService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleDetailVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
similarity index 78%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
index 8e8284d..a7b825e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/alarmRule/service/impl/AlarmRuleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.alarmRule.service.impl;
+package cn.gistack.alerts.alarmRule.service.impl;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.mapper.AlarmRuleMapper;
-import cn.gistack.sm.alarmRule.service.AlarmRuleService;
-import cn.gistack.sm.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
+import cn.gistack.alerts.alarmRule.mapper.AlarmRuleMapper;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
+import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/launch/AlertsLauncherServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/launch/AlertsLauncherServiceImpl.java
new file mode 100644
index 0000000..67aee7d
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/launch/AlertsLauncherServiceImpl.java
@@ -0,0 +1,48 @@
+package cn.gistack.alerts.launch;
+
+import org.springblade.core.auto.service.AutoService;
+import cn.gistack.common.constant.LauncherConstant;
+import org.springblade.core.launch.service.LauncherService;
+import org.springblade.core.launch.utils.PropsUtil;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+import java.util.Properties;
+
+/**
+ * 启动参数拓展
+ *
+ * @author smallchil
+ */
+@AutoService(LauncherService.class)
+public class AlertsLauncherServiceImpl implements LauncherService {
+
+ @Override
+ public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
+ Properties props = System.getProperties();
+ // 通用注册
+ PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.server-addr", LauncherConstant.nacosAddr(profile));
+ PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile));
+
+
+ PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile));
+ PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile));
+ //开启多数据源
+ PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "true");
+
+ // 开启elk日志
+ // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
+
+ // seata注册地址
+ // PropsUtil.setProperty(props, "seata.service.grouplist.default", LauncherConstant.seataAddr(profile));
+ // seata注册group格式
+ // PropsUtil.setProperty(props, "seata.tx-service-group", LauncherConstant.seataServiceGroup(appName));
+ // seata配置服务group
+ // PropsUtil.setProperty(props, "seata.service.vgroup-mapping.".concat(LauncherConstant.seataServiceGroup(appName)), LauncherConstant.DEFAULT_MODE);
+ // seata注册模式配置
+ // PropsUtil.setProperty(props, "seata.registry.type", LauncherConstant.NACOS_MODE);
+ // PropsUtil.setProperty(props, "seata.registry.nacos.server-addr", LauncherConstant.nacosAddr(profile));
+ // PropsUtil.setProperty(props, "seata.config.type", LauncherConstant.NACOS_MODE);
+ // PropsUtil.setProperty(props, "seata.config.nacos.server-addr", LauncherConstant.nacosAddr(profile));
+ }
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
new file mode 100644
index 0000000..75aac73
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java
@@ -0,0 +1,265 @@
+package cn.gistack.alerts.sms.controller;
+
+import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.gistack.alerts.sms.entity.SmsRequest;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.service.SmsService;
+import cn.gistack.alerts.sms.util.SmsUtils;
+import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
+import cn.gistack.system.user.entity.User;
+import cn.gistack.system.user.feign.IUserClient;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.redis.cache.BladeRedis;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import static cn.gistack.common.cache.CacheNames.PHONE_KEY;
+
+/**
+ * 短信发送控制层
+ * @author zhongrj
+ * @date 2023-04-22
+ */
+@Slf4j
+@RestController
+@RequestMapping("/sms/sms")
+@AllArgsConstructor
+public class SmsController {
+
+ private final SmsService smsService;
+
+ private final BladeRedis bladeRedis;
+
+ private final IUserClient userClient;
+
+ @GetMapping("/test")
+ public void setRedis(){
+ saveCodeForRedis("super_admin","123456");
+ }
+
+ /**
+ * 短信固定内容发送通用方法（仅支持 {xx} 模式的模板）
+ * request 必须包含手机号,模板id,拼接好的内容
+ * @param request
+ * @return
+ */
+ @PostMapping("/sendFixedContentByXXModel")
+ public R sendFixedContentByXXModel(@RequestBody SMSSendRequest request){
+ // 手机号码校验
+ if(validatePhone(request.getUserNumber())) {
+ // 发送操作
+ ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
+ // 记录发送记录操作
+ SmsResult smsResult = smsService.saveSendResult(request, 1);
+ if (null != smsResult){
+ smsService.saveSendRecord(request, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ }
+ // 返回发送信息
+ return R.data(resultComResult);
+ }
+ // 返回发送信息
+ return R.fail(400,"该手机号不存在!");
+ }
+
+
+ /**
+ * 短信动态内容发送通用方法（仅支持 具名变量 {手机号码:11} 模式的模板）
+ * request 必须包含手机号,模板id,拼接好的内容
+ * @param smsRequest
+ * @return
+ */
+ @PostMapping("/sendFixedContentByNamedVariableModel")
+ public R sendFixedContentByNamedVariableModel(@RequestBody SmsRequest smsRequest){
+ // 处理数据(可能是多个手机号情况)
+ List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
+ // 保存发送结果
+ // 记录保存
+ SMSSendRequest request = new SMSSendRequest();
+ request.setMessageContent(smsRequest.getContent());
+ request.setTemplateId(smsRequest.getTemplateId());
+ SmsResult smsResult = smsService.saveSendResult(request, list.size());
+ // 遍历
+ for (String phone : list) {
+ DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
+ dynSMSSendRequest.setTemplateId(smsRequest.getTemplateId());
+ dynSMSSendRequest.setDynData(smsRequest.getParams());
+ // 手机号校验
+ if(validator(phone)) {
+ // 发送邮件短信
+ ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(dynSMSSendRequest);
+ // 记录保存
+ if (null != smsResult) {
+ SMSSendRequest smsSendRequest = new SMSSendRequest();
+ smsSendRequest.setUserNumber(phone);
+ smsSendRequest.setMessageContent(smsRequest.getContent());
+ smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ smsService.saveSendRecord(smsSendRequest, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ }
+ }else {
+ // 手机号有误记录
+ // 记录保存
+ SMSSendRequest smsSendRequest = new SMSSendRequest();
+ smsSendRequest.setUserNumber(phone);
+ smsSendRequest.setMessageContent(smsRequest.getContent());
+ smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ smsService.saveSendRecord(smsSendRequest, 400,"手机号错误未发送...",null);
+ }
+ }
+ return R.status(true);
+ }
+
+ /**
+ * 发送登录验证码
+ * request 必须包含手机号
+ * @param request
+ * @return
+ */
+ @PostMapping("/sendCode")
+ public R sendCode(@RequestBody SMSSendRequest request){
+ // 手机号码校验
+ if(validatePhone(request.getUserNumber())) {
+ //设置模板相关信息
+ String templateId = "2431012205498";
+ String randNumber = SmsUtils.getRandNumber();
+ String content = "您的登录验证码是" + randNumber + ",5分钟内有效,请勿泄漏,如非本人操作,请忽略此信息";
+ request.setMessageContent(content);
+ request.setTemplateId(templateId);
+ // 发送操作
+ ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
+ // 记录发送记录操作
+ SmsResult smsResult = smsService.saveSendResult(request, 1);
+ if (null != smsResult){
+ smsService.saveSendRecord(request, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ }
+ // 保存验证码到 redis
+ saveCodeForRedis(request.getUserNumber(), randNumber);
+ // 返回发送信息
+ return R.data(resultComResult);
+ }
+ // 返回发送信息
+ return R.fail(400,"该手机号不存在!");
+ }
+
+ /**
+ * 校验手机号码正确性
+ * @param userNumber
+ * @return
+ */
+ private boolean validatePhone(String userNumber) {
+ // 校验手机号码正确性
+ if (validator(userNumber)){
+ // 校验该账户是否已注册，通过手机号查询用户是否存在,tenantId 暂时写死，未登陆情况 tenantId 获取不到
+ R<List<User>> list = userClient.userInfoByPhoneOrAccount("000000", userNumber);
+ if (list.getData().size()>0){
+ return true;
+ }
+ return false;
+ }
+ return false;
+ }
+
+ /**
+ * 校验手机号码
+ */
+ public static boolean validator(String phone) {
+ if (null!=phone && !phone.equals("")) {
+ String regex = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$";
+ if (phone.length() != 11) {
+ return false;
+ } else {
+ Pattern p = Pattern.compile(regex);
+ Matcher m = p.matcher(phone);
+ boolean isMatch = m.matches();
+ return isMatch;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 保存验证码到 redis
+ * @param userNumber
+ * @param randNumber
+ */
+ private void saveCodeForRedis(String userNumber, String randNumber) {
+ bladeRedis.setEx(PHONE_KEY + userNumber,randNumber,5*60L);
+ }
+
+ /**
+ * 发送邮件提醒
+ * @param smsRequest
+ * @return
+ */
+ @PostMapping("/sendEmailMsg")
+ public R sendEmailMsg(@RequestBody SmsRequest smsRequest){
+ // 处理数据(可能是多个手机号情况)
+ List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
+ // 保存发送结果
+ // 记录保存
+ SMSSendRequest request = new SMSSendRequest();
+ request.setMessageContent(smsRequest.getContent());
+ request.setTemplateId("2431012165299");
+ SmsResult smsResult = smsService.saveSendResult(request, list.size());
+ // 遍历
+ for (String phone : list) {
+ DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
+ dynSMSSendRequest.setTemplateId("2431012165299");
+ dynSMSSendRequest.setDynData(new String[][]{{"手机号码", "标题"}, {phone, smsRequest.getContent()}});
+ // 手机号校验
+ if(validator(phone)) {
+ // 发送邮件短信
+ ComResult<DynSMSSendDataResult> resultComResult = SmsUtils.dynSendMethod(dynSMSSendRequest);
+ // 记录保存
+ if (null != smsResult) {
+ SMSSendRequest smsSendRequest = new SMSSendRequest();
+ smsSendRequest.setUserNumber(phone);
+ smsSendRequest.setMessageContent(smsRequest.getContent());
+ smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ smsService.saveSendRecord(smsSendRequest, resultComResult.getCode(),resultComResult.getMsg(),smsResult.getId());
+ }
+ }else {
+ // 手机号有误记录
+ // 记录保存
+ SMSSendRequest smsSendRequest = new SMSSendRequest();
+ smsSendRequest.setUserNumber(phone);
+ smsSendRequest.setMessageContent(smsRequest.getContent());
+ smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
+ // 记录发送记录操作
+ smsService.saveSendRecord(smsSendRequest, 400,"手机号错误未发送...",null);
+ }
+ }
+ return R.status(true);
+ }
+
+ /**
+ * 发送 xx 变量模板短信
+ * @param smsRequest 发送对象
+ * @return
+ */
+ @PostMapping("/sendXXMsg")
+ public R sendXXMsg(@RequestBody SmsRequestTemplate smsRequest){
+ return R.data(smsService.sendXXMsg(smsRequest.getSmsRequest(),smsRequest.getPhoneNumbers()));
+ }
+
+
+ /**
+ * 发送 具名 变量模板短信
+ * @param smsRequest 发送对象
+ * @return
+ */
+ @PostMapping("/sendSignMsg")
+ public R sendSignMsg(@RequestBody SmsRequestTemplate smsRequest){
+ return R.data(smsService.sendSignMsg(smsRequest));
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
index a1eab54..1ebe2b1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsRecordController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.sms.controller;
+package cn.gistack.alerts.sms.controller;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.service.ISmsRecordService;
-import cn.gistack.sm.sms.vo.SmsRecordVO;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.service.ISmsRecordService;
+import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,6 +13,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
+
import java.util.Arrays;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsResultController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsResultController.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsResultController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsResultController.java
index 7f42a6a..2ecf39e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsResultController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsResultController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.sms.controller;
+package cn.gistack.alerts.sms.controller;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.service.ISmsResultService;
-import cn.gistack.sm.sms.vo.SmsResultVO;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.service.ISmsResultService;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsTemplateController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
similarity index 94%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsTemplateController.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
index 9bab309..191d93e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsTemplateController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsTemplateController.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.sms.controller;
+package cn.gistack.alerts.sms.controller;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.service.ISmsTemplateService;
-import cn.gistack.sm.sms.vo.SmsTemplateVO;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.service.ISmsTemplateService;
+import cn.gistack.alerts.sms.vo.SmsTemplateVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java
new file mode 100644
index 0000000..34952a7
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/feign/SmsRecordClient.java
@@ -0,0 +1,52 @@
+package cn.gistack.alerts.sms.feign;
+
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.service.SmsService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 短信发送记录
+ * @author zhongrj
+ * @date 2023-06-02
+ */
+@NonDS
+@ApiIgnore
+@RestController
+@AllArgsConstructor
+public class SmsRecordClient implements ISmsRecordClient {
+
+ private final SmsService smsService;
+
+ /**
+ * 短信记录发送保存
+ * @param userNumber
+ * @param messageContent
+ * @param templateId
+ * @param code
+ * @param msg
+ * @param number
+ */
+ @Override
+ @GetMapping(SAVE_SMS_RECORD)
+ public void saveSmsRecord(String userNumber,
+ String messageContent,
+ String templateId,
+ Integer code,
+ String msg,
+ Integer number) {
+ SMSSendRequest request = new SMSSendRequest();
+ request.setUserNumber(userNumber);
+ request.setTemplateId(templateId);
+ request.setMessageContent(messageContent);
+ // 记录发送记录操作
+ SmsResult smsResult = smsService.saveSendResult(request, number);
+ if (null != smsResult){
+ smsService.saveSendRecord(request, code,msg,smsResult.getId());
+ }
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.java
similarity index 79%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.java
index 5a2382c..4967e8e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.sms.mapper;
+package cn.gistack.alerts.sms.mapper;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.vo.SmsRecordVO;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.xml
similarity index 83%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.xml
index 1469123..459a0e1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsRecordMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.sms.mapper.SmsRecordMapper">
+<mapper namespace="cn.gistack.alerts.sms.mapper.SmsRecordMapper">
<!--自定义分页列表查询-->
- <select id="selectSmsRecordPage" resultType="cn.gistack.sm.sms.vo.SmsRecordVO">
+ <select id="selectSmsRecordPage" resultType="cn.gistack.alerts.sms.vo.SmsRecordVO">
select * from sm_sms_record where 1=1 and is_deleted = 0
<if test="smsRecord.phone!=null and smsRecord.phone!=''">
and phone like concat(concat('%',#{smsRecord.phone}),'%')
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.java
similarity index 79%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.java
index 2f76a06..31b67ed 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.java
@@ -1,10 +1,11 @@
-package cn.gistack.sm.sms.mapper;
+package cn.gistack.alerts.sms.mapper;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.vo.SmsResultVO;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
+
import java.util.List;
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
similarity index 66%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
index c1f52a3..b73ae6a 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsResultMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsResultMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.sms.mapper.SmsResultMapper">
+<mapper namespace="cn.gistack.alerts.sms.mapper.SmsResultMapper">
<!--自定义分页列表查询-->
- <select id="selectSmsResultPage" resultType="cn.gistack.sm.sms.vo.SmsResultVO">
+ <select id="selectSmsResultPage" resultType="cn.gistack.alerts.sms.vo.SmsResultVO">
select * from sm_sms_result where 1=1 and is_deleted = 0
order by id desc
</select>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
similarity index 79%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
index dd89828..c6b9587 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.sms.mapper;
+package cn.gistack.alerts.sms.mapper;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.vo.SmsTemplateVO;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.vo.SmsTemplateVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
similarity index 84%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.xml
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
index 22a743b..6f94d55 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/mapper/SmsTemplateMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/mapper/SmsTemplateMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.gistack.sm.sms.mapper.SmsTemplateMapper">
+<mapper namespace="cn.gistack.alerts.sms.mapper.SmsTemplateMapper">
<!--自定义列表查询-->
- <select id="selectSmsTemplatePage" resultType="cn.gistack.sm.sms.vo.SmsTemplateVO">
+ <select id="selectSmsTemplatePage" resultType="cn.gistack.alerts.sms.vo.SmsTemplateVO">
select * from sm_sms_template where is_deleted = 0
<if test="smsTemplate.templateName!=null and smsTemplate.templateName!=''">
and template_name like concat(concat('%',#{smsTemplate.templateName}),'%')
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsRecordService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsRecordService.java
similarity index 73%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsRecordService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsRecordService.java
index a8ef748..67aacf1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsRecordService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsRecordService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.sms.service;
+package cn.gistack.alerts.sms.service;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.vo.SmsRecordVO;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsResultService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsResultService.java
similarity index 73%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsResultService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsResultService.java
index aae0e3b..382c01e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsResultService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsResultService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.sms.service;
+package cn.gistack.alerts.sms.service;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.vo.SmsResultVO;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsTemplateService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsTemplateService.java
similarity index 76%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsTemplateService.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsTemplateService.java
index 9def4d3..b8032b1 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/ISmsTemplateService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/ISmsTemplateService.java
@@ -1,7 +1,7 @@
-package cn.gistack.sm.sms.service;
+package cn.gistack.alerts.sms.service;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.vo.SmsTemplateVO;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.vo.SmsTemplateVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
new file mode 100644
index 0000000..15f6000
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/SmsService.java
@@ -0,0 +1,50 @@
+package cn.gistack.alerts.sms.service;
+
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
+
+import java.util.List;
+
+/**
+ * 短信发送服务接口
+ * @author zhongrj
+ * @date 2023-05-30
+ */
+public interface SmsService {
+
+ /**
+ * 发送 xx 变量模板短信
+ * @param phoneNumbers 手机号集合
+ * @param request 内容对象
+ * @return
+ */
+ Object sendXXMsg(SMSSendRequest request,
+ List<String> phoneNumbers);
+
+ /**
+ * 发送 具名 变量模板短信
+ * @param smsRequestTemplate
+ * @return
+ */
+ Object sendSignMsg(SmsRequestTemplate smsRequestTemplate);
+
+ /**
+ * 保存短信发送结果
+ * @param request
+ * @param number
+ * @return
+ */
+ SmsResult saveSendResult(SMSSendRequest request, Integer number);
+
+ /**
+ * 短信发送记录保存
+ * @param request
+ * @param code
+ * @param sendMsg
+ * @param resultId
+ * @return
+ */
+ SmsRecord saveSendRecord(SMSSendRequest request,Integer code, String sendMsg, Long resultId);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
similarity index 75%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsRecordServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
index c93d055..aed5514 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.sms.service.impl;
+package cn.gistack.alerts.sms.service.impl;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.mapper.SmsRecordMapper;
-import cn.gistack.sm.sms.service.ISmsRecordService;
-import cn.gistack.sm.sms.vo.SmsRecordVO;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.mapper.SmsRecordMapper;
+import cn.gistack.alerts.sms.service.ISmsRecordService;
+import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsResultServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
similarity index 75%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsResultServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
index 66ced69..06830f3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsResultServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.sms.service.impl;
+package cn.gistack.alerts.sms.service.impl;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.mapper.SmsResultMapper;
-import cn.gistack.sm.sms.service.ISmsResultService;
-import cn.gistack.sm.sms.vo.SmsResultVO;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.mapper.SmsResultMapper;
+import cn.gistack.alerts.sms.service.ISmsResultService;
+import cn.gistack.alerts.sms.vo.SmsResultVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
similarity index 84%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
index 8af6ee2..b4be00b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java
@@ -1,20 +1,20 @@
-package cn.gistack.sm.sms.service.impl;
+package cn.gistack.alerts.sms.service.impl;
import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
-import cn.gistack.sm.alarmRule.entity.AlarmRecordDetail;
-import cn.gistack.sm.alarmRule.service.AlarmRecordDetailService;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.service.ISmsRecordService;
-import cn.gistack.sm.sms.service.ISmsResultService;
-import cn.gistack.sm.sms.service.SmsService;
-import cn.gistack.sm.sms.util.SmsUtils;
-import cn.gistack.sm.sms.vo.SmsRequestTemplate;
+import cn.gistack.alerts.alarmRule.entity.AlarmRecordDetail;
+import cn.gistack.alerts.alarmRule.service.AlarmRecordDetailService;
+import cn.gistack.alerts.sms.entity.SmsRecord;
+import cn.gistack.alerts.sms.entity.SmsResult;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.service.ISmsRecordService;
+import cn.gistack.alerts.sms.service.ISmsResultService;
+import cn.gistack.alerts.sms.service.SmsService;
+import cn.gistack.alerts.sms.util.SmsUtils;
+import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,7 +56,7 @@
ComResult<SMSSendDataResult> result = SmsUtils.sendMsg(request);
if(null != smsResult) {
// 保存记录
- saveSmsRecord(request, result.getCode(), result.getMsg(), smsResult.getId());
+ saveSendRecord(request, result.getCode(), result.getMsg(), smsResult.getId());
}
list.add(result);
}
@@ -114,7 +114,7 @@
// 设置内容
request.setMessageContent(format);
// 保存记录
- smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
+ smsRecord = saveSendRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
if (null != smsRecord){
alarmRecordDetail.setAlarmContent(format);
alarmRecordDetail.setSendRecordId(smsRecord.getId());
@@ -159,7 +159,7 @@
SmsRecord smsRecord = new SmsRecord();
if (null != smsResult){
// 保存记录
- smsRecord = saveSmsRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
+ smsRecord = saveSendRecord(request, resultComResult.getCode(), resultComResult.getMsg(), smsResult.getId());
}
Map<String, Object> map = new HashMap<>(2);
map.put("smsRecord",smsRecord);
@@ -168,34 +168,14 @@
return map;
}
- /**
- * 保存发送短信记录信息
- * @param request
- * @param code 响应code
- * @param msg 响应消息
- * @param resultId
- */
- private SmsRecord saveSmsRecord(SMSSendRequest request,Integer code,String msg, Long resultId) {
- // 在保存明细
- SmsRecord smsRecord = new SmsRecord();
- smsRecord.setTel(request.getUserNumber());
- smsRecord.setContent(request.getMessageContent());
- smsRecord.setTemplateId(request.getTemplateId());
- smsRecord.setResultId(resultId);
- smsRecord.setResponseStatus(code.toString());
- smsRecord.setResponseMsg(msg);
- //插入记录
- smsRecordService.save(smsRecord);
- // 返回
- return smsRecord;
- }
/**
* 发送记录保存
* @param request 发送信息
* @param number 号码个数
*/
- private SmsResult saveSendResult(SMSSendRequest request,Integer number) {
+ @Override
+ public SmsResult saveSendResult(SMSSendRequest request,Integer number) {
// 先保存结果表
SmsResult smsResult = new SmsResult();
smsResult.setTemplateId(request.getTemplateId());
@@ -209,4 +189,28 @@
// 返回
return null;
}
+
+
+ /**
+ * 保存发送短信记录信息
+ * @param request
+ * @param code 响应code
+ * @param sendMsg 响应消息
+ * @param resultId
+ */
+ @Override
+ public SmsRecord saveSendRecord(SMSSendRequest request, Integer code, String sendMsg, Long resultId) {
+ // 在保存明细
+ SmsRecord smsRecord = new SmsRecord();
+ smsRecord.setTel(request.getUserNumber());
+ smsRecord.setContent(request.getMessageContent());
+ smsRecord.setTemplateId(request.getTemplateId());
+ smsRecord.setResultId(resultId);
+ smsRecord.setResponseStatus(code.toString());
+ smsRecord.setResponseMsg(sendMsg);
+ //插入记录
+ smsRecordService.save(smsRecord);
+ // 返回
+ return smsRecord;
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsTemplateServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
similarity index 75%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsTemplateServiceImpl.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
index a268320..7f9e917 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/impl/SmsTemplateServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsTemplateServiceImpl.java
@@ -1,9 +1,9 @@
-package cn.gistack.sm.sms.service.impl;
+package cn.gistack.alerts.sms.service.impl;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.mapper.SmsTemplateMapper;
-import cn.gistack.sm.sms.service.ISmsTemplateService;
-import cn.gistack.sm.sms.vo.SmsTemplateVO;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.mapper.SmsTemplateMapper;
+import cn.gistack.alerts.sms.service.ISmsTemplateService;
+import cn.gistack.alerts.sms.vo.SmsTemplateVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java
new file mode 100644
index 0000000..b86465e
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/util/SmsUtils.java
@@ -0,0 +1,125 @@
+package cn.gistack.alerts.sms.util;
+
+import cn.com.flaginfo.sdk.cmc.api.ApiProvider;
+import cn.com.flaginfo.sdk.cmc.api.request.ApiConfig;
+import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSAPI;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendDataResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSApi;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
+import cn.com.flaginfo.sdk.cmc.common.ApiEnum;
+import cn.gistack.common.constant.SmsConstant;
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+
+import static cn.gistack.common.constant.SmsConstant.*;
+
+/**
+ * 短信发送工具类
+ * @author zhongrj
+ * @date 2023-05-30
+ */
+@Component
+public class SmsUtils {
+
+ /**
+ * 固定内容发送
+ */
+ public static ComResult<SMSSendDataResult> sendMsg(SMSSendRequest sendRequest) {
+ ApiConfig apiConfig = new ApiConfig(SpCode, AppKey, AppSecret);
+ ApiProvider provider = ApiProvider.getInstance(apiConfig);
+ //请求接口
+ SMSApi api = (SMSApi) provider.getApi(ApiEnum.SENDSMS);
+ api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendUrl);
+ //请求参数
+ sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
+ ComResult<SMSSendDataResult> request = api.request(sendRequest);
+ // 返回
+ return request;
+ }
+
+ /**
+ * 获取随机字符串
+ * @return
+ */
+ public static String getRandNumber() {
+ Random random = new Random();
+ //把随机生成的数字转成字符串
+ String str = String.valueOf(random.nextInt(9));
+ for (int i = 0; i < 5; i++) {
+ str += random.nextInt(9);
+ }
+ return str;
+ }
+
+ /**
+ * 动态短信内容批量发送
+ */
+ public static ComResult<DynSMSSendDataResult> dynSendMethod(DynSMSSendRequest sendRequest) {
+ ApiConfig apiConfig = new ApiConfig(SpCode, AppKey, AppSecret);
+ ApiProvider provider = ApiProvider.getInstance(apiConfig);
+ //请求接口
+ DynSMSAPI api = (DynSMSAPI) provider.getApi(ApiEnum.SENDDYNSMS);
+ api.setRequestUrl(SmsConstant.HOST + SmsConstant.sendVarUrl);
+ //请求参数
+ sendRequest.setSerialNumber(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()));
+ ComResult<DynSMSSendDataResult> result = api.request(sendRequest);
+ // 返回
+ return result;
+ }
+
+ /**
+ * 状态报告
+ */
+// public void testReportMethod() {
+// //请求接口
+// SMSReportAPI api = (SMSReportAPI) provider.getApi(ApiEnum.REPORTSMS);
+// api.setRequestUrl(SmsConstant.HOST + "/info/sms/report");
+// //请求
+// ComResult<List<SMSReportResult>> result = api.request(new SMSReportRequest());
+// List<SMSReportResult> data = result.getData();
+// if (data.size() > 0) {
+// System.out.println(data.get(0).getResult());
+// }
+// System.out.println(JSON.toJSONString(data));
+// System.out.println(JSON.toJSONString(result));
+//
+// }
+
+ /**
+ * 上行回复查询
+ */
+// public void testReplyMethod() {
+// //请求接口
+// SMSReplyAPI api = (SMSReplyAPI) provider.getApi(ApiEnum.REPLYSMS);
+// api.setRequestUrl(SmsConstant.HOST + "/info/sms/reply/query");
+// SMSReplyRequest smsReplyRequest = new SMSReplyRequest();
+// //请求
+// ComResult<SMSReplyDataResult> result = api.request(smsReplyRequest);
+// System.out.println(result.getData().getMaxId());
+// if (result.getData().getApiSmsReplyBoList() != null && result.getData().getApiSmsReplyBoList().size() > 0) {
+// System.out.println(result.getData().getApiSmsReplyBoList().get(0).getContent());
+// }
+// System.out.println(JSON.toJSONString(result));
+// }
+
+ /**
+ * 上行回复查询数据收到确认
+ */
+// public void testReplyConfirmMethod() {
+// //请求接口
+// SMSReplyConfirmAPI api = (SMSReplyConfirmAPI) provider.getApi(ApiEnum.REPLYSMSCONFIRM);
+// //请求Url
+// SMSReplyConfirmRequest req = new SMSReplyConfirmRequest();
+// api.setRequestUrl(SmsConstant.HOST + "/info/sms/reply/confirm");
+// req.setMaxId("10110572149");
+// ComResult request = api.request(req);
+// System.out.println(request.isSucc());
+// System.out.println(JSON.toJSONString(request));
+// }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRequestTemplate.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
similarity index 88%
rename from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRequestTemplate.java
rename to skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
index 7135da0..4c6b31d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/vo/SmsRequestTemplate.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java
@@ -1,8 +1,8 @@
-package cn.gistack.sm.sms.vo;
+package cn.gistack.alerts.sms.vo;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
-import cn.gistack.sm.notice.vo.PersonVO;
-import cn.gistack.sm.sms.entity.SmsTemplate;
+import cn.gistack.alerts.sms.entity.SmsTemplate;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-dev.yml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..588c3c3
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-dev.yml
@@ -0,0 +1,43 @@
+#服务器端口
+server:
+ port: 8111
+
+#数据源配置
+#spring:
+# datasource:
+# url: ${blade.datasource.dev.url}
+# username: ${blade.datasource.dev.username}
+# password: ${blade.datasource.dev.password}
+
+#多数据源配置
+spring:
+ #排除DruidDataSourceAutoConfigure
+ autoconfigure:
+ exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ datasource:
+ dynamic:
+ #设置默认的数据源或者数据源组,默认值即为master
+ primary: master
+ datasource:
+ ## 业务默认数据源
+ master:
+ url: ${blade.datasource.dev.url}
+ username: ${blade.datasource.dev.username}
+ password: ${blade.datasource.dev.password}
+ ##中台数据源
+ zt:
+ url: ${blade.datasource.dev.zt.url}
+ username: ${blade.datasource.dev.zt.username}
+ password: ${blade.datasource.dev.zt.password}
+ # 智能外呼数据库
+ ztznwh:
+ url: ${blade.datasource.dev.ztznwh.url}
+ username: ${blade.datasource.dev.ztznwh.username}
+ password: ${blade.datasource.dev.ztznwh.password}
+ ## 定时器数据源
+ xxljob:
+ url: ${blade.datasource.dev.xxljob.url}
+ username: ${blade.datasource.dev.xxljob.username}
+ password: ${blade.datasource.dev.xxljob.password}
+ main:
+ allow-circular-references: true
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-prod.yml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..2ba235e
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/resources/application-prod.yml
@@ -0,0 +1,41 @@
+#服务器端口
+server:
+ port: 8110
+
+#数据源配置
+#spring:
+# datasource:
+# url: ${blade.datasource.prod.url}
+# username: ${blade.datasource.prod.username}
+# password: ${blade.datasource.prod.password}
+
+#多数据源配置
+spring:
+ #排除DruidDataSourceAutoConfigure
+ autoconfigure:
+ exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ datasource:
+ dynamic:
+ #设置默认的数据源或者数据源组,默认值即为master
+ primary: master
+ datasource:
+ master:
+ url: ${blade.datasource.prod.url}
+ username: ${blade.datasource.prod.username}
+ password: ${blade.datasource.prod.password}
+ zt:
+ url: ${blade.datasource.prod.zt.url}
+ username: ${blade.datasource.prod.zt.username}
+ password: ${blade.datasource.prod.zt.password}
+ # 智能外呼数据库
+ ztznwh:
+ url: ${blade.datasource.prod.ztznwh.url}
+ username: ${blade.datasource.prod.ztznwh.username}
+ password: ${blade.datasource.prod.ztznwh.password}
+ ## 定时器数据源
+ xxljob:
+ url: ${blade.datasource.prod.xxljob.url}
+ username: ${blade.datasource.prod.xxljob.username}
+ password: ${blade.datasource.prod.xxljob.password}
+ main:
+ allow-circular-references: true
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml
index d12d19a..b17b751 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/pom.xml
@@ -52,6 +52,11 @@
<artifactId>skjcmanager-user-api</artifactId>
<version>3.0.1.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>cn.gistack</groupId>
+ <artifactId>skjcmanager-alerts-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
<!--Job-->
<dependency>
<groupId>com.xuxueli</groupId>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/PtInfoConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/PtInfoConstant.java
deleted file mode 100644
index e465694..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/PtInfoConstant.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.gistack.sm.notice.constant;
-
-/**
- * 平台服务信息常量
- * @author zhongrj
- * @since 2023-04-21
- */
-public class PtInfoConstant {
-
- /**
- * 平台服务电话
- */
- public static final String serverPhone = "01234567890";
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiDataColumnConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiDataColumnConstant.java
deleted file mode 100644
index 02b52c5..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiDataColumnConstant.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.gistack.sm.notice.constant;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 中台接口响应列常量
- * @author zhongrj
- * @since 2023-04-21
- */
-public class ZtApiDataColumnConstant {
-
-
- /**
- * 水位数据缺失字段（不包含责任人相关信息）
- */
- public static List<String> waterInfoNotList = new ArrayList<String>()
- {{
- add("county_nm,town_nm");
- add("res_nm");
- }};
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiUrlConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiUrlConstant.java
deleted file mode 100644
index a225e43..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtApiUrlConstant.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.gistack.sm.notice.constant;
-
-/**
- * 中台接口请求信息常量
- * @author zhongrj
- * @since 2023-04-21
- */
-public class ZtApiUrlConstant {
-
-
- /**
- * 水位数据缺失
- */
- public static final String res_z_null_api = "http://10.42.6.192/services/1234567890ABCDEFGHIJKLMN/res/z_null";
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtConfigConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtConfigConstant.java
deleted file mode 100644
index c135f24..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/constant/ZtConfigConstant.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.gistack.sm.notice.constant;
-
-/**
- * 中台接口请求信息常量
- * @author zhongrj
- * @since 2023-04-21
- */
-public class ZtConfigConstant {
-
- /**
- * 请求头 key
- */
- public static final String header_key = "apiKey";
-
- /**
- * 请求头 value
- */
- public static final String header_value = "F1DBECD719108635189480CF60E6553ADB3109616426BD537F25A430DFC613B491A025C4A51E77FD08C6E5B7CBE05917A461286E7B6D69F1AB1B14F946149D2065B0C675F8FEDF4B9B05C1496881BC5A";
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeController.java
deleted file mode 100644
index a4bf1a5..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeController.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.gistack.sm.notice.controller;
-
-import cn.gistack.sm.notice.strategy.NoticeStrategyContext;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 通知信息控制层
- * @author zhongrj
- * @date 2023-05-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/notice/notice")
-public class NoticeController {
-
- private final NoticeStrategyContext applicationContext;
-
- /**
- * 调用任务通知
- * @param type 策略分类
- * @param name 任务名称
- * @param content 内容（可以不传）
- * @return
- */
- @GetMapping("/toNotice")
- public Object toNotice(String type,String name,String content){
- return applicationContext.doSomethingByStrategy(name, content, type);
- }
-
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeTypeController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeTypeController.java
deleted file mode 100644
index ddae9f7..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/controller/NoticeTypeController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.gistack.sm.notice.controller;
-
-import cn.gistack.sm.notice.entity.Notice;
-import cn.gistack.sm.notice.strategy.NoticeTypeStrategyContext;
-import cn.gistack.sm.notice.strategy.service.INoticeService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 通知信息控制层
- * @author zhongrj
- * @date 2023-05-29
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/noticeType/noticeType")
-public class NoticeTypeController {
-
- private final NoticeTypeStrategyContext applicationContext;
-
- @GetMapping("/toNotice")
- public Object toNotice(Notice notice){
- INoticeService noticeService = applicationContext.getResource(notice);
- return noticeService.toNotice(notice);
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/entity/Notice.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/entity/Notice.java
deleted file mode 100644
index 47f7663..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/entity/Notice.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.gistack.sm.notice.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 通知类
- * @author zhongrj
- * @date 2023-05-29
- */
-@Data
-public class Notice implements Serializable {
-
- /**
- * 通知类型
- */
- private String type;
-
- /**
- * 通知内容
- */
- private String content;
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/enums/PersonEnum.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/enums/PersonEnum.java
deleted file mode 100644
index 097139e..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/enums/PersonEnum.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.gistack.sm.notice.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 责任人枚举类
- *
- * @author Chill
- */
-@Getter
-@AllArgsConstructor
-public enum PersonEnum {
-
- /**
- * 行政责任人
- */
- AREA_TYPE("行政责任人",1),
- /**
- * 主管部门责任人
- */
- SUPERVISOR_TYPE("主管部门责任人",2),
- /**
- * 管理单位责任人
- */
- MANAGE_TYPE("管理单位责任人",3),
- /**
- * 技术责任人
- */
- TECHNOLOGY_TYPE("技术责任人",4),
-
- /**
- * 巡查责任人
- */
- PERSON_TYPE("巡查责任人",5),
- ;
-
- final String name;
-
- final Integer type;
-
- /**
- * findByType
- * @param name
- * @return
- */
- public static PersonEnum findByName(String name) {
- //循环遍历对应的 PersonEnum
- for (PersonEnum item : values()) {
- if(item.getName().equals(name)) {
- return item;
- }
- }
- return null;
- }
-
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeStrategyContext.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeStrategyContext.java
deleted file mode 100644
index 6f8f09a..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeStrategyContext.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.gistack.sm.notice.strategy;
-
-import cn.gistack.sm.notice.strategy.service.impl.NoticeStrategyImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.BiFunction;
-
-/**
- * 通知方式策略
- * @author zhongrj
- * @date 2023-05-29
- *
- */
-@Service
-@Slf4j
-public class NoticeStrategyContext {
-
- /**
- * 存放所有策略.
- */
- private Map<String, BiFunction<String, String, String>> strategyMap = new HashMap<>(18);
-
- /**
- * 具体的策略细节.
- */
- @Autowired
- private NoticeStrategyImpl noticeStrategyImpl;
-
- /**
- * 加载所有策略
- */
- @PostConstruct
- public void initStrategies() {
- strategyMap.put("waterInfoNotHandle", (arg1, arg2) -> noticeStrategyImpl.waterInfoNotHandle(arg1, arg2));
- strategyMap.put("waterDataExcHandle", (arg1, arg2) -> noticeStrategyImpl.waterDataExcHandle(arg1, arg2));
- }
-
- /**
- * 指派具体的策略去执行.
- *
- * @param arg1 参数1
- * @param arg2 参数2
- * @param key 根据key 来获取不同的策略
- * @return
- */
- public String doSomethingByStrategy(String arg1, String arg2, String key) {
- BiFunction<String, String, String> biFunction = strategyMap.get(key);
- if (Objects.isNull(biFunction)) {
- // 没有找到特定的策略，则采用默认实现（一般只有加了新的类型，但是没有配置对应的处理策略才会走到这里）
- log.warn("========= 没有配置该处理策略，采用默认实现，key {} ====== " + key);
- return noticeStrategyImpl.doSomethingDefault(arg1, arg2);
- }
- return biFunction.apply(arg1, arg2);
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeTypeStrategyContext.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeTypeStrategyContext.java
deleted file mode 100644
index 8af58fa..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/NoticeTypeStrategyContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.gistack.sm.notice.strategy;
-
-import cn.gistack.sm.notice.entity.Notice;
-import cn.gistack.sm.notice.strategy.service.INoticeService;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * 通知策略
- * @author zhongrj
- * @date 2023-05-30
- * @Description : 利用Spring的发现机制,将实现了NoticeStrategyService的类都put到noticeStrategyMap里面。
- * 后面只需要根据type对应好 各个实现类的注解 如： @Component("tel") 就可以取出不同的业务实现类
- */
-@Service
-public class NoticeTypeStrategyContext {
-
- private final Map<String, INoticeService> noticeStrategyMap = new ConcurrentHashMap<>();
-
- public NoticeTypeStrategyContext(Map<String, INoticeService> strategyMap) {
- this.noticeStrategyMap.clear();
- strategyMap.forEach((k, v)-> this.noticeStrategyMap.put(k, v));
- }
-
- public INoticeService getResource(Notice notice){
- return noticeStrategyMap.get(notice.getType());
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/INoticeService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/INoticeService.java
deleted file mode 100644
index 61f836f..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/INoticeService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.gistack.sm.notice.strategy.service;
-
-import cn.gistack.sm.notice.entity.Notice;
-import org.aspectj.weaver.ast.Not;
-
-/**
- * 通知策略接口
- * @author zhongrj
- * @date 2023-05-29
- */
-public interface INoticeService {
-
- /**
- * 通知接口
- * @param notice
- * @return
- */
- Object toNotice(Notice notice);
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/InStationNoticeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/InStationNoticeServiceImpl.java
deleted file mode 100644
index 8415233..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/InStationNoticeServiceImpl.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.gistack.sm.notice.strategy.service.impl;
-
-import cn.gistack.sm.notice.entity.Notice;
-import cn.gistack.sm.notice.strategy.service.INoticeService;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-/**
- * 站内信通知
- * @author zhongrj
- * @date 2023-05-29
- */
-@Component("inStation")
-public class InStationNoticeServiceImpl implements INoticeService {
-
- /**
- * 站内信通知实现
- * @param notice
- * @return
- */
- @Override
- public Object toNotice(Notice notice) {
- return "inStation";
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/NoticeStrategyImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/NoticeStrategyImpl.java
deleted file mode 100644
index c22c71c..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/NoticeStrategyImpl.java
+++ /dev/null
@@ -1,466 +0,0 @@
-package cn.gistack.sm.notice.strategy.service.impl;
-
-import cn.gistack.sm.alarmRule.entity.AlarmRecord;
-import cn.gistack.sm.alarmRule.entity.AlarmRule;
-import cn.gistack.sm.alarmRule.service.AlarmRecordService;
-import cn.gistack.sm.alarmRule.service.AlarmRuleDetailService;
-import cn.gistack.sm.alarmRule.service.AlarmRuleService;
-import cn.gistack.sm.intelligentCall.constant.ZtConstant;
-import cn.gistack.sm.notice.constant.PtInfoConstant;
-import cn.gistack.sm.notice.constant.ZtApiDataColumnConstant;
-import cn.gistack.sm.notice.constant.ZtApiUrlConstant;
-import cn.gistack.sm.notice.enums.PersonEnum;
-import cn.gistack.sm.notice.util.FormatUtil;
-import cn.gistack.sm.notice.vo.PersonVO;
-import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
-import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.service.ISmsTemplateService;
-import cn.gistack.sm.sms.service.SmsService;
-import cn.gistack.sm.sms.vo.SmsRequestTemplate;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 通知策略
- *
- * @author zhongrj
- * @date 2023-05-30
- */
-@Component
-public class NoticeStrategyImpl {
-
- @Autowired
- private SmsService smsService;
-
- @Autowired
- private AlarmRuleService alarmRuleService;
-
- @Autowired
- private AlarmRecordService alarmRecordService;
-
- @Autowired
- private ISmsTemplateService smsTemplateService;
-
- @Autowired
- private RestTemplate restTemplate;
-
- @Autowired
- private IAttAdBaseService attAdBaseService;
-
- @Autowired
- private IAttResManagePersonService attResManagePersonService;
-
-
- /**
- * 短信发送数据组装
- *
- * @param jsonArray
- * @param templateId
- * @param columnsList 列名集合信息
- * @return
- */
- private SmsRequestTemplate getSendSmsTemplate(JSONArray jsonArray, String templateId,AlarmRule alarmRule,List<String> columnsList) {
- // 通过模板id 查询模板相关信息
- SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId).eq("is_deleted", 0));
- if (null != smsTemplate) {
- SmsRequestTemplate smsRequestTemplate = new SmsRequestTemplate();
- // 设置短信模板信息
- smsRequestTemplate.setSmsTemplate(smsTemplate);
- // 解析模板并设置 title
- smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
- getColumnData(jsonArray, columnsList,smsRequestTemplate,templateId,alarmRule);
- //返回
- return smsRequestTemplate;
- }
- return null;
- }
-
- /**
- * 列名数据转换
- * @param jsonArray
- * @param columnsList
- * @param smsRequestTemplate
- * @param templateId
- * @return
- */
- private void getColumnData(JSONArray jsonArray,
- List<String> columnsList,
- SmsRequestTemplate smsRequestTemplate,
- String templateId,
- AlarmRule alarmRule) {
- List<PersonVO> personLists = new ArrayList<>();
- List<List<String>> lists = new ArrayList<>();
- for (int i = 0; i < jsonArray.size(); i++) {
- // 根据水库编号，所在区域查询需要发送的人员手机号及设置
- String res_cd = jsonArray.getJSONObject(i).getString("res_cd");
- // 查询告警人员信息
- List<PersonVO> personVOList = getPersonListByResGuid(res_cd,templateId,alarmRule);
- if (personVOList.size() > 0) {
- for (PersonVO personVO : personVOList) {
- List<String> list = new ArrayList<>();
- list.add(res_cd);
- list.add(personVO.getPhone());
- // 变量将值放入集合中
- for (String column : columnsList) {
- String[] split = column.split(",");
- String format = "";
- for (String s : split) {
- format = format + jsonArray.getJSONObject(i).getString(s);
- }
- list.add(format);
- }
- lists.add(list);
- }
- }
- personLists.addAll(personVOList);
- }
- // 设置信息
- smsRequestTemplate.setPersonVOList(personLists);
- smsRequestTemplate.setTemplateContent(lists);
- }
-
- /**
- * 保存告警记录信息
- * @param list
- * @param alarmRule 告警规则
- * @return
- */
- private AlarmRecord saveAlarmRecord(List<String> list,AlarmRule alarmRule) {
- AlarmRecord alarmRecord = new AlarmRecord();
- // 设置相关信息
- alarmRecord.setAlarmRuleId(alarmRule.getId().toString());
- alarmRecord.setReservoirNumber(list.get(0));
- alarmRecord.setAlarmCondition(alarmRule.getRuleRemark());
- // 新增
- boolean save = alarmRecordService.save(alarmRecord);
- if (save){
- return alarmRecord;
- }
- // 返回
- return null;
- }
-
- /**
- * 查询告警人员信息
- * @param res_cd 水库 guid
- * @param templateId
- * @param alarmRule
- * @return
- */
- private List<PersonVO> getPersonListByResGuid(String res_cd,String templateId,AlarmRule alarmRule) {
- // 查询对应的角色信息
- String roles = alarmRule.getAlarmPerson();
- String[] roleArray = roles.split(",");
- List<String> personList = new ArrayList<>();
- List<String> areaList = new ArrayList<>();
- // 遍历
- for (String role : roleArray) {
- if (role.contains("责任人")){
- personList.add(PersonEnum.findByName(role).getType().toString());
- }else {
- areaList.add(role);
- }
- }
- // 根据角色，水库编号查询对应的告警人员信息
- //1. 根据水库编号查询除责任人之外的人员信息
- List<PersonVO> personVOList = attAdBaseService.getPersonListByResGuid(res_cd);
- //2. 根据水库编号及责任人类型查询相关责任人信息
- List<PersonVO> personVOList1 = attResManagePersonService.getPersonListByResGuid(res_cd,personList);
- // 合并人员数据
- personVOList.addAll(personVOList1);
- // 返回数据
- return personVOList;
- }
-
- /**
- * 默认实现
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String doSomethingDefault(String arg1, String arg2) {
- // 默认业务逻辑处理...
- return "默认实现";
- }
-
- /**
- * 策略1: 水位信息接收不到
- *
- * @param arg1 告警规则名称
- * @param arg2
- * @return
- */
- public String waterInfoNotHandle(String arg1, String arg2) {
- // 查询当前策略对应的告警规则信息
- AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
- if (null!=alarmRule) {
- // 调用中台服务接口查询数据
- JSONArray ztData = getZtData("", ZtApiUrlConstant.res_z_null_api);
- // 只发短信，将发短信信息组装好
- SmsRequestTemplate smsRequestTemplate = getSendSmsTemplate(ztData, "2431012216668",alarmRule, ZtApiDataColumnConstant.waterInfoNotList);
- // 拼接内容后面的联系方式,当前模板拼接平台服务电话
- // 遍历，拼接平台服务电话
- for (List<String> list : smsRequestTemplate.getTemplateContent()) {
- // 添加平台电话
- list.add(PtInfoConstant.serverPhone);
- // 保存告警记录信息
- AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
- if (null != alarmRecord) {
- list.add(alarmRecord.getId().toString());
- }
- }
- // 调用短信服务
- smsService.sendSignMsg(smsRequestTemplate);
- }
- // 保存预警记录
- return "水位信息接收不到";
- }
-
- /**
- * 策略2: 水位数据异常
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterDataExcHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "水位数据异常";
- }
-
- /**
- * 策略3: 水位超低于死水位
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterLessDeadHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略4: 水位高于死水位，低于旱警水位
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterMoreDeadLessHJHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略5: 水位接近汛限告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterComeOverHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略6: 水位初次超汛限告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterFirstOverHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略7: 水位小幅超汛限告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterSmallScaleOverHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略8: 水位大幅超汛限告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterBigScaleOverHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略9: 水位接近设计洪水位告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterComeDesignHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略10: 水位超设计洪水位告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterMoreDesignHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略11: 水位超校核洪水位告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterMoreCheckHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略12: 近1h水位陡升
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterComeOneHourUpHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略13: 近1h水位陡降
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String waterComeOneHourDownHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略14: 暴雨降雨预警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String rainstormHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略15: 已降大雨告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String alreadyHeavyRainHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略16: 已降暴雨告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String alreadyRainstormHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略17: 2小时降雨告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String twoHourRainHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 策略18: 6小时降雨告警
- *
- * @param arg1
- * @param arg2
- * @return
- */
- public String sixHourRainHandle(String arg1, String arg2) {
- // 业务逻辑处理 2...
- return "";
- }
-
- /**
- * 调用中台接口查询数据
- *
- * @param params
- * @param url
- * @return
- */
- private JSONArray getZtData(String params, String url) {
- //设置请求头
- HttpHeaders headers = new HttpHeaders();
- headers.add(ZtConstant.header_key, ZtConstant.header_value);
- //封装请求头
- HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
- try {
- //有请求头，有参数请求
- ResponseEntity<String> responseEntity =
- restTemplate.exchange(url + params,
- HttpMethod.GET,
- formEntity,
- String.class);
- JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
- JSONArray jsonArray = JSONArray.parseArray(jsonObject.get("data").toString());
- // 返回
- return jsonArray;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/SmsNoticeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/SmsNoticeServiceImpl.java
deleted file mode 100644
index dfd634d..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/SmsNoticeServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.gistack.sm.notice.strategy.service.impl;
-
-import cn.gistack.sm.notice.entity.Notice;
-import cn.gistack.sm.notice.strategy.service.INoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-/**
- * 短信通知
- * @author zhongrj
- * @date 2023-05-29
- */
-@Component("sms")
-public class SmsNoticeServiceImpl implements INoticeService {
-
- /**
- * 短信通知实现
- * @param notice
- * @return
- */
- @Override
- public Object toNotice(Notice notice) {
- // 短信发送
- return "sms";
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/TelNoticeServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/TelNoticeServiceImpl.java
deleted file mode 100644
index 4156d51..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/strategy/service/impl/TelNoticeServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.gistack.sm.notice.strategy.service.impl;
-
-import cn.gistack.sm.notice.entity.Notice;
-import cn.gistack.sm.notice.strategy.service.INoticeService;
-import org.springframework.stereotype.Component;
-
-/**
- * 电话通知
- * @author zhongrj
- * @date 2023-05-29
- */
-@Component("tel")
-public class TelNoticeServiceImpl implements INoticeService {
-
- /**
- * 电话通知实现
- * @param notice
- * @return
- */
- @Override
- public Object toNotice(Notice notice) {
- return "tel";
- }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/util/FormatUtil.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/util/FormatUtil.java
deleted file mode 100644
index 9b0c889..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/util/FormatUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.gistack.sm.notice.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 格式化转换工具
- * @author zhongrj
- * @date 2023-05-31
- */
-public class FormatUtil {
-
- /**
- * 取出｛｝中的内容
- * @param content
- * @return
- */
- public static String composeMessage(String content){
- // 正则 ，匹配 ｛｝及内所有内容
- String regex = "\\{.+?\\}";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(content);
- List<String> list = new ArrayList<>();
- list.add("手机号码");
- while (matcher.find()) {
- // 键名
- String key = matcher.group();
- // 去除首尾大括号
- String title = key.substring(1,key.length()-1).split(",")[0];
- // 放入集合
- list.add(title);
- }
- // 转换为以逗号分隔的字符串
- return String.join(",",list);
- }
-
-
-
-// public static void main(String[] args) {
-// String data = "黄色预警：{日期,2}日{小时,2}时{分钟,2}分，{乡镇,10}乡镇{村,10}村{水库名称,25}水位{水库水位值,6}米过去一小时陡降{水位降值,6}米。过去24小时坝前点雨量{雨量值,6}毫米。请巡查责任人{姓名,4}做好巡查值守，发现险情及时上报；请技术责任人{姓名,4}密切关注。如为数据误报，请及时联系市县水利部门人员{姓名联系电话,16}（电话号码）。";
-// String message = composeMessage(data);
-// System.out.println("message = " + message);
-//
-// String s = "黄色预警：{日期,2}{小时,2}{分钟,2}分数据误报，";
-// String s1 = s.replaceAll("\\{.+?\\}", "%s");
-// System.out.println(s1);
-//
-// String s2 = "1,2,3";
-//
-//
-// String format = String.format(s1, Arrays.asList(s2.split(",")));
-// System.out.println("format = " + format);
-// }
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/vo/PersonVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/vo/PersonVO.java
deleted file mode 100644
index b925b1c..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/notice/vo/PersonVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.gistack.sm.notice.vo;
-
-import lombok.Data;
-
-/**
- * 人员信息vo
- * @author zhongrj
- * @date 2023-05-31
- */
-@Data
-public class PersonVO {
-
- /**
- * 姓名
- */
- private String name;
-
- /**
- * 角色
- */
- private String roleName;
-
- /**
- * 手机号
- */
- private String phone;
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
index 31ebe6e..99d4e24 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/feign/AttResManagePersonClient.java
@@ -3,7 +3,9 @@
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
+import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import jodd.util.StringUtil;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
@@ -14,6 +16,7 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -31,6 +34,7 @@
private final IAttResManagePersonService attResManagePersonService;
private final IAttAdBaseService adBaseService;
+ private final IAttResBaseService attResBaseService;
@Override
@GetMapping(QUERY_LIST_BY_PHONE)
@@ -56,4 +60,25 @@
return R.data(null);
}
+
+ /**
+ * 查询责任人相关信息
+ * @param guid
+ * @param personList
+ * @return
+ */
+ @Override
+ public List<PersonVO> getPersonListByResGuid(String guid, String personList) {
+ return attResManagePersonService.getPersonListByResGuid(guid, Arrays.asList(personList.split(",")));
+ }
+
+ /**
+ *
+ * @param res_cd
+ * @return
+ */
+ @Override
+ public List<PersonVO> getUserListByResGuid(String res_cd) {
+ return adBaseService.getPersonListByResGuid(res_cd);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
index 08db5c3..aafba07 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.java
@@ -1,7 +1,7 @@
package cn.gistack.sm.sjztmd.mapper;
import cn.gistack.common.node.TreeNode;
-import cn.gistack.sm.notice.vo.PersonVO;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
index 6fa0895..810201f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttAdBaseMapper.xml
@@ -87,7 +87,7 @@
</select>
<!--根据水库编号查询除责任人之外的人员信息-->
- <select id="getPersonListByResGuid" resultType="cn.gistack.sm.notice.vo.PersonVO">
+ <select id="getPersonListByResGuid" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
select bu.real_name,bu.phone,bd.ad_code from YWXT.blade_user bu left join YWXT.blade_dept bd on instr(bu.dept_id,bd.id)>0 and bd.is_deleted = 0
where bu.is_deleted = 0
and bd.ad_code in (
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
index b13972c..e1345bc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.java
@@ -1,8 +1,8 @@
package cn.gistack.sm.sjztmd.mapper;
-import cn.gistack.sm.notice.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -32,5 +32,5 @@
* @return
*/
@DS("zt")
- List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd,@Param("list") List<String> personList);
+ List<PersonVO> getPersonListByResGuid(@Param("res_cd")String res_cd, @Param("list") List<String> personList);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
index 3de8aaf..606466d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResManagePersonMapper.xml
@@ -70,7 +70,7 @@
</insert>
<!--根据水库编号及责任人类型查询相关责任人信息-->
- <select id="getPersonListByResGuid" resultType="cn.gistack.sm.notice.vo.PersonVO">
+ <select id="getPersonListByResGuid" resultType="cn.gistack.sm.sjztmd.vo.PersonVO">
select "user_name" as name,"user_phone" as phone
from "SJZT_MD"."att_res_manage_person"
where "res_guid" = #{res_cd}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
index ae8d1f7..4e9d446 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttAdBaseService.java
@@ -1,8 +1,8 @@
package cn.gistack.sm.sjztmd.service;
-import cn.gistack.sm.notice.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
index 73bcaf3..5c0c9e3 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResManagePersonService.java
@@ -1,8 +1,8 @@
package cn.gistack.sm.sjztmd.service;
-import cn.gistack.sm.notice.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.core.tool.api.R;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
index 3d569ac..633c1e2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttAdBaseServiceImpl.java
@@ -2,7 +2,7 @@
import cn.gistack.common.node.TreeNode;
import cn.gistack.common.utils.NodeTreeUtil;
-import cn.gistack.sm.notice.vo.PersonVO;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.mapper.AttAdBaseMapper;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
@@ -11,7 +11,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
index 24ad5b3..b0490de 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResManagePersonServiceImpl.java
@@ -1,10 +1,10 @@
package cn.gistack.sm.sjztmd.service.impl;
-import cn.gistack.sm.notice.vo.PersonVO;
import cn.gistack.sm.sjztmd.entity.AttResManagePerson;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
import cn.gistack.sm.sjztmd.mapper.AttResManagePersonMapper;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
+import cn.gistack.sm.sjztmd.vo.PersonVO;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.tool.api.R;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
index 9159806..b414803 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/controller/SmsController.java
@@ -1,15 +1,10 @@
package cn.gistack.sm.sms.controller;
-import cn.com.flaginfo.sdk.cmc.api.sms.dynsend.DynSMSSendRequest;
+import cn.com.flaginfo.sdk.cmc.api.result.ComResult;
+import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
-import cn.gistack.sm.sms.entity.SmsRecord;
-import cn.gistack.sm.sms.entity.SmsRequest;
-import cn.gistack.sm.sms.entity.SmsResult;
-import cn.gistack.sm.sms.service.ISmsRecordService;
-import cn.gistack.sm.sms.service.ISmsResultService;
-import cn.gistack.sm.sms.service.SmsService;
+import cn.gistack.alerts.sms.feign.ISmsRecordClient;
import cn.gistack.sm.sms.util.SmsUtils;
-import cn.gistack.sm.sms.vo.SmsRequestTemplate;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSON;
@@ -19,8 +14,6 @@
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -37,94 +30,11 @@
@AllArgsConstructor
public class SmsController {
- private final ISmsRecordService smsRecordService;
-
- private final ISmsResultService smsResultService;
-
- private final SmsService smsService;
-
private final BladeRedis bladeRedis;
private final IUserClient userClient;
- @GetMapping("/test")
- public void setRedis(){
- saveCodeForRedis("super_admin","123456");
- }
-
- /**
- * 短信固定内容发送通用方法（仅支持 {xx} 模式的模板）
- * request 必须包含手机号,模板id,拼接好的内容
- * @param request
- * @return
- */
- @PostMapping("/sendFixedContentByXXModel")
- public R sendFixedContentByXXModel(@RequestBody SMSSendRequest request){
- // 手机号码校验
- if(validatePhone(request.getUserNumber())) {
- // 发送操作
- String sendMsg = JSON.toJSONString(SmsUtils.sendMsg(request));
- JSONObject jsonObject = JSON.parseObject(sendMsg);
- // 记录发送记录操作
- SmsResult smsResult = saveSendResult(request, 1);
- if (null != smsResult){
- saveSendRecord(request, sendMsg,smsResult.getId());
- }
- // 返回发送信息
- return R.data(jsonObject);
- }
- // 返回发送信息
- return R.fail(400,"该手机号不存在!");
- }
-
-
- /**
- * 短信动态内容发送通用方法（仅支持 具名变量 {手机号码:11} 模式的模板）
- * request 必须包含手机号,模板id,拼接好的内容
- * @param smsRequest
- * @return
- */
- @PostMapping("/sendFixedContentByNamedVariableModel")
- public R sendFixedContentByNamedVariableModel(@RequestBody SmsRequest smsRequest){
- // 处理数据(可能是多个手机号情况)
- List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
- // 保存发送结果
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId(smsRequest.getTemplateId());
- SmsResult smsResult = saveSendResult(request, list.size());
- // 遍历
- for (String phone : list) {
- DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId(smsRequest.getTemplateId());
- dynSMSSendRequest.setDynData(smsRequest.getParams());
- // 手机号校验
- if(validator(phone)) {
- // 发送邮件短信
- String dynSendMsg = JSON.toJSONString(SmsUtils.dynSendMethod(dynSMSSendRequest));
- // 记录保存
- if (null != smsResult) {
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(smsSendRequest, dynSendMsg,smsResult.getId());
- }
- }else {
- // 手机号有误记录
- // 记录保存
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(smsSendRequest, "手机号错误未发送...",null);
- }
- }
- return R.status(true);
- }
+ private final ISmsRecordClient smsRecordClient;
/**
* 发送登录验证码
@@ -143,15 +53,19 @@
request.setMessageContent(content);
request.setTemplateId(templateId);
// 发送操作
- String sendMsg =JSON.toJSONString(SmsUtils.sendMsg(request));
+ ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
+ String sendMsg =JSON.toJSONString(resultComResult);
JSONObject jsonObject = JSON.parseObject(sendMsg);
- // 记录发送记录操作
- SmsResult smsResult = saveSendResult(request, 1);
- if (null != smsResult){
- saveSendRecord(request, sendMsg,smsResult.getId());
- }
// 保存验证码到 redis
saveCodeForRedis(request.getUserNumber(), randNumber);
+ // 记录发送记录操作
+ smsRecordClient.saveSmsRecord(
+ request.getUserNumber(),
+ request.getMessageContent(),
+ request.getTemplateId(),
+ resultComResult.getCode(),
+ resultComResult.getMsg(),
+ 1);
// 返回发送信息
return R.data(jsonObject);
}
@@ -202,117 +116,5 @@
*/
private void saveCodeForRedis(String userNumber, String randNumber) {
bladeRedis.setEx(PHONE_KEY + userNumber,randNumber,5*60L);
- }
-
- /**
- * 发送记录保存
- * @param request 发送信息
- * @param sendMsg 响应数据
- * @param resultId 发送结果id
- */
- private void saveSendRecord(SMSSendRequest request, String sendMsg,Long resultId) {
- // 在保存明细
- SmsRecord smsRecord = new SmsRecord();
- smsRecord.setTel(request.getUserNumber());
- smsRecord.setContent(request.getMessageContent());
- smsRecord.setTemplateId(request.getTemplateId());
- smsRecord.setResContent(sendMsg);
- smsRecord.setResultId(resultId);
- // 解析 sendMsg
- JSONObject jsonObject = JSON.parseObject(sendMsg);
- smsRecord.setResponseStatus(jsonObject.getString("code"));
- smsRecord.setResponseMsg(jsonObject.getString("msg"));
- //插入记录
- smsRecordService.save(smsRecord);
- }
-
- /**
- * 发送记录保存
- * @param request 发送信息
- * @param number 号码个数
- */
- private SmsResult saveSendResult(SMSSendRequest request,Integer number) {
- // 先保存结果表
- SmsResult smsResult = new SmsResult();
- smsResult.setTemplateId(request.getTemplateId());
- smsResult.setContent(request.getMessageContent());
- smsResult.setNumber(number);
- //插入记录
- boolean save = smsResultService.save(smsResult);
- if (save){
- return smsResult;
- }
- // 返回
- return null;
- }
-
-
-
- /**
- * 发送邮件提醒
- * @param smsRequest
- * @return
- */
- @PostMapping("/sendEmailMsg")
- public R sendEmailMsg(@RequestBody SmsRequest smsRequest){
- // 处理数据(可能是多个手机号情况)
- List<String> list = Arrays.asList(smsRequest.getPhone().split(","));
- // 保存发送结果
- // 记录保存
- SMSSendRequest request = new SMSSendRequest();
- request.setMessageContent(smsRequest.getContent());
- request.setTemplateId("2431012165299");
- SmsResult smsResult = saveSendResult(request, list.size());
- // 遍历
- for (String phone : list) {
- DynSMSSendRequest dynSMSSendRequest = new DynSMSSendRequest();
- dynSMSSendRequest.setTemplateId("2431012165299");
- dynSMSSendRequest.setDynData(new String[][]{{"手机号码", "标题"}, {phone, smsRequest.getContent()}});
- // 手机号校验
- if(validator(phone)) {
- // 发送邮件短信
- String dynSendMsg = JSON.toJSONString(SmsUtils.dynSendMethod(dynSMSSendRequest));
- // 记录保存
- if (null != smsResult) {
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(smsSendRequest, dynSendMsg,smsResult.getId());
- }
- }else {
- // 手机号有误记录
- // 记录保存
- SMSSendRequest smsSendRequest = new SMSSendRequest();
- smsSendRequest.setUserNumber(phone);
- smsSendRequest.setMessageContent(smsRequest.getContent());
- smsSendRequest.setTemplateId(dynSMSSendRequest.getTemplateId());
- // 记录发送记录操作
- saveSendRecord(smsSendRequest, "手机号错误未发送...",null);
- }
- }
- return R.status(true);
- }
-
- /**
- * 发送 xx 变量模板短信
- * @param smsRequest 发送对象
- * @return
- */
- @PostMapping("/sendXXMsg")
- public R sendXXMsg(@RequestBody SmsRequestTemplate smsRequest){
- return R.data(smsService.sendXXMsg(smsRequest.getSmsRequest(),smsRequest.getPhoneNumbers()));
- }
-
-
- /**
- * 发送 具名 变量模板短信
- * @param smsRequest 发送对象
- * @return
- */
- @PostMapping("/sendSignMsg")
- public R sendSignMsg(@RequestBody SmsRequestTemplate smsRequest){
- return R.data(smsService.sendSignMsg(smsRequest));
}
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/SmsService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/SmsService.java
deleted file mode 100644
index ceb9e1c..0000000
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/service/SmsService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.gistack.sm.sms.service;
-
-import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
-import cn.gistack.sm.sms.entity.SmsTemplate;
-import cn.gistack.sm.sms.vo.SmsRequestTemplate;
-
-import java.util.List;
-
-/**
- * 短信发送服务接口
- * @author zhongrj
- * @date 2023-05-30
- */
-public interface SmsService {
-
- /**
- * 发送 xx 变量模板短信
- * @param phoneNumbers 手机号集合
- * @param request 内容对象
- * @return
- */
- Object sendXXMsg(SMSSendRequest request,
- List<String> phoneNumbers);
-
- /**
- * 发送 具名 变量模板短信
- * @param smsRequestTemplate
- * @return
- */
- Object sendSignMsg(SmsRequestTemplate smsRequestTemplate);
-}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
index 6eb8e67..c35e578 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sms/util/SmsUtils.java
@@ -10,12 +10,13 @@
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendDataResult;
import cn.com.flaginfo.sdk.cmc.api.sms.send.SMSSendRequest;
import cn.com.flaginfo.sdk.cmc.common.ApiEnum;
-import cn.gistack.sm.sms.constant.SmsConstant;
+import cn.gistack.common.constant.SmsConstant;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Random;
-import static cn.gistack.sm.sms.constant.SmsConstant.*;
+
+import static cn.gistack.common.constant.SmsConstant.*;
/**
* 短信发送工具类
--
Gitblit v1.9.3