From 8fa3600cdf80771ac93d23fe4c37796717525615 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 09 Aug 2024 11:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skBaiYiTest/controller/SkBaiYiController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skBaiYiTest/controller/SkBaiYiController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skBaiYiTest/controller/SkBaiYiController.java
index 29aba6d..7088516 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skBaiYiTest/controller/SkBaiYiController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/skBaiYiTest/controller/SkBaiYiController.java
@@ -9,8 +9,6 @@
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.base.BaseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -68,11 +66,11 @@
for (BaiYiTestEntity item : list ) {
String skName = item.getSkName();
String termitePointNum = item.getTermitePointNum();
- personInCharge = item.getPersonInCharge();
- phone = item.getPhone();
+
if(sknm.equals(skName)){
-
+ personInCharge = item.getPersonInCharge();
+ phone = item.getPhone();
statListStr = statListStr + termitePointNum + ","; // 同一个水库的报警白蚁测点拼接起来
}
@@ -85,18 +83,20 @@
}
}
// 获取到了数据开始发短信
+ System.err.println("发送白蚁报警短信数量："+msgEntityList.size());
if (msgEntityList!= null && msgEntityList.size()>0) {
+ System.err.println("白蚁报警信息：");
for (WarnMsg item : msgEntityList) {
+ System.err.println(item.toString());
String skName = item.getSkName();
String personInCharge = item.getPersonInCharge();
String phone = item.getPhone();
String bayistate = item.getBayistate();
-
SMSSendRequest request = new SMSSendRequest();
request.setUserNumber(phone);
- request.setTemplateId("2431012268292");//短信模版编号
- request.setMessageContent("紧急通知："+skName+" 中 "+bayistate+" 以上白蚁监测点发生白蚁预警，请立安排人前去检查是否真实存在白蚁。");
+ request.setTemplateId("2431012282799");//短信模版编号
+ request.setMessageContent("紧急通知："+skName+" 中以下白蚁监测点发生白蚁预警，请立安排人前去检查是否真实存在白蚁："+ bayistate);
SmsUtils.sendMsg(request);
}
--
Gitblit v1.9.3