From ff6ebfbf3f62d89ab3c404a10157a64dd766bd49 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 15 Jul 2024 13:06:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=A6=86=E5=86=B0?= =?UTF-8?q?=E5=A4=A9=E6=B0=94=E6=8B=89=E5=8A=9B=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ZhipingController.java | 15 +++++++++------ .../xymanager_common/util/DingTalkPushUtil.java | 4 ++-- .../xymanager_common/zhiping/PulliceModel.java | 7 +++++++ .../timeTask/MntnCheckTask.java | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java index 18bc2ff..141bbb2 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java @@ -3,13 +3,10 @@ package com.shxy.xymanager_admin.controller; import com.github.pagehelper.PageInfo; import com.shxy.xymanager_common.annotation.Log; import com.shxy.xymanager_common.base.BaseController; -import com.shxy.xymanager_common.util.DigestUtils; -import com.shxy.xymanager_common.util.StringUtils; -import com.shxy.xymanager_common.util.TokenUtil; +import com.shxy.xymanager_common.util.*; import com.shxy.xymanager_common.zhiping.*; import com.shxy.xymanager_common.entity.LeadPulls; import com.shxy.xymanager_common.entity.Weathers; -import com.shxy.xymanager_common.util.DateUtil; import com.shxy.xymanager_service.service.HenanService; import com.shxy.xymanager_service.service.LeadPullsService; import com.shxy.xymanager_service.service.WeatherService; @@ -196,13 +193,16 @@ public class ZhipingController extends BaseController { item.setEquipId(weather.getCmdid()); result.add(item); } + } else { + String str = "从" + startTime + "到" + endTime + "无天气数据"; + DingTalkPushUtil.pushText("覆冰", str); } return SdqjResult.success(result); } @PostMapping("queryPullIces") - @ApiOperation("拉力覆冰数据同步查询") - @Log(title = "拉力覆冰数据同步查询", type = "查询") + @ApiOperation("覆冰拉力数据同步查询") + @Log(title = "覆冰拉力数据同步查询", type = "查询") public SdqjResult queryPullIces(String token, String startTime, String endTime) throws Exception { @@ -250,6 +250,9 @@ public class ZhipingController extends BaseController { item.calculate(); result.add(item); } + } else { + String str = "从" + startTime + "到" + endTime + "无覆冰拉力数据"; + DingTalkPushUtil.pushText("覆冰", str); } return SdqjResult.success(result); } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/DingTalkPushUtil.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/DingTalkPushUtil.java index 8441392..016e29e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/DingTalkPushUtil.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/DingTalkPushUtil.java @@ -22,7 +22,7 @@ public class DingTalkPushUtil { public static final String KEY_WORD = "告警: "; - public static void pushText(String content) { + public static void pushText(String title, String content) { try { Long timestamp = System.currentTimeMillis(); String stringToSign = timestamp + "\n" + SECRET; @@ -39,7 +39,7 @@ public class DingTalkPushUtil { */ //定义文本内容 OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text(); - text.setContent(KEY_WORD + content); + text.setContent(title + KEY_WORD + content); //设置消息类型 req.setMsgtype("text"); req.setText(text); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/zhiping/PulliceModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/zhiping/PulliceModel.java index 527e4da..a9c8a2c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/zhiping/PulliceModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/zhiping/PulliceModel.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_common.zhiping; +import com.shxy.xymanager_common.util.DingTalkPushUtil; import lombok.Data; @Data @@ -21,8 +22,14 @@ public class PulliceModel { private String T_Sensor_Num; public void calculate() { + if ("0".equalsIgnoreCase(pull)) { + String str = "装置" + pointId + "于" + collTime + "的拉力数据为0"; + DingTalkPushUtil.pushText("覆冰", str); + } if ("65535".equalsIgnoreCase(pull)) { pull = "0"; + String str = "装置" + pointId + "于" + collTime + "的拉力数据为65535"; + DingTalkPushUtil.pushText("覆冰", str); } double fCcll = Double.parseDouble(ccll) * 9.8; double fPull = Double.parseDouble(pull) * 9.8; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java index 054b561..396b9c4 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java @@ -56,7 +56,7 @@ public class MntnCheckTask { String str = alertList.get(0); alertList.remove(0); webSocketServer.sendMessage(str); - DingTalkPushUtil.pushText(str); + DingTalkPushUtil.pushText("运维", str); } }